DeforaOS/libDesktop
DeforaOS/libDesktop
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prepares migration to Gtk+ 3.0

Browse Source
This commit is contained in:
Pierre Pronchery 2011-04-15 23:21:42 +00:00
parent 36d2af3948
commit 024ecab613
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/Desktop/accel.h
View File

@ -1,5 +1,5 @@
/* $Id$ */ /* $Id$ */
/* Copyright (c) 2009 Pierre Pronchery <khorben@defora.org> */ /* Copyright (c) 2011 Pierre Pronchery <khorben@defora.org> */
/* This file is part of DeforaOS Desktop libDesktop */ /* This file is part of DeforaOS Desktop libDesktop */
/* This program is free software: you can redistribute it and/or modify /* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -23,7 +23,7 @@
/* types */ /* types */
typedef struct _DesktopAccel typedef struct _DesktopAccel
{ {
GtkSignalFunc callback; GCallback callback;
GdkModifierType modifier; GdkModifierType modifier;
unsigned int accel; unsigned int accel;
} DesktopAccel; } DesktopAccel;

4
include/Desktop/menubar.h
View File

@ -1,5 +1,5 @@
/* $Id$ */ /* $Id$ */
/* Copyright (c) 2009 Pierre Pronchery <khorben@defora.org> */ /* Copyright (c) 2011 Pierre Pronchery <khorben@defora.org> */
/* This file is part of DeforaOS Desktop libDesktop */ /* This file is part of DeforaOS Desktop libDesktop */
/* This program is free software: you can redistribute it and/or modify /* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -24,7 +24,7 @@
typedef struct _DesktopMenu typedef struct _DesktopMenu
{ {
const char * name; const char * name;
GtkSignalFunc callback; GCallback callback;
const char * stock; const char * stock;
GdkModifierType modifier; GdkModifierType modifier;
unsigned int accel; unsigned int accel;

4
include/Desktop/toolbar.h
View File

@ -1,5 +1,5 @@
/* $Id$ */ /* $Id$ */
/* Copyright (c) 2009 Pierre Pronchery <khorben@defora.org> */ /* Copyright (c) 2011 Pierre Pronchery <khorben@defora.org> */
/* This file is part of DeforaOS Desktop libDesktop */ /* This file is part of DeforaOS Desktop libDesktop */
/* This program is free software: you can redistribute it and/or modify /* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -24,7 +24,7 @@
typedef struct _DesktopToolbar typedef struct _DesktopToolbar
{ {
const char * name; const char * name;
GtkSignalFunc callback; GCallback callback;
const char * stock; const char * stock;
GdkModifierType modifier; GdkModifierType modifier;
unsigned int accel; unsigned int accel;

2
src/menubar.c
View File

@ -41,7 +41,7 @@ GtkWidget * desktop_menubar_create(DesktopMenubar * menubar, gpointer data,
menuitem = gtk_menu_item_new_with_mnemonic(_(menubar[i].name)); menuitem = gtk_menu_item_new_with_mnemonic(_(menubar[i].name));
menu = _menubar_create_menu(menubar[i].menu, data, accel); menu = _menubar_create_menu(menubar[i].menu, data, accel);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu);
gtk_menu_bar_append(GTK_MENU_BAR(ret), menuitem); gtk_menu_shell_append(GTK_MENU_SHELL(ret), menuitem);
} }
return ret; return ret;
} }