Skip to content

Commit 4d0b010

Browse files
L1L1@gmx.comL1L1@gmx.com
L1L1@gmx.com
authored and
L1L1@gmx.com
committed
Cleanup and compatibility with Debian 7
1 parent 3f95f95 commit 4d0b010

File tree

2 files changed

+45
-45
lines changed

2 files changed

+45
-45
lines changed

‎ui/gtk/gui_cardview.c‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,18 +221,22 @@ static void menu_cardview_context_menu(GtkWidget *treeview, GdkEventButton *even
221221
/* Create a right click context menu */
222222
{
223223
GtkWidget *menu, *menuitem;
224-
GtkWidget *menuitem_child;
225224
GtkTreeViewColumn *column2 = gtk_tree_view_get_column(GTK_TREE_VIEW(treeview),2);
226225
UNUSED(userdata);
226+
#if GTK_CHECK_VERSION(3,6,0)
227+
GtkWidget *menuitem_child;
228+
#endif
227229

228230
menu = gtk_menu_new();
229231

230232
/* Menu Item */
231233
menuitem = gtk_menu_item_new_with_label("Copy");
232234
g_signal_connect(menuitem, "activate",
233235
(GCallback) menu_cardview_copy, treeview);
236+
#if GTK_CHECK_VERSION(3,6,0)
234237
menuitem_child = gtk_bin_get_child (GTK_BIN (menuitem));
235238
gtk_accel_label_set_accel (GTK_ACCEL_LABEL (menuitem_child), GDK_KEY_c, GDK_CONTROL_MASK);
239+
#endif
236240
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
237241

238242
/* Menu Item */
@@ -254,8 +258,10 @@ static void menu_cardview_context_menu(GtkWidget *treeview, GdkEventButton *even
254258
g_signal_connect(menuitem, "activate",
255259
(GCallback) menu_cardview_context_menu_change_value_type, treeview);
256260
}
261+
#if GTK_CHECK_VERSION(3,6,0)
257262
menuitem_child = gtk_bin_get_child (GTK_BIN (menuitem));
258263
gtk_accel_label_set_accel (GTK_ACCEL_LABEL (menuitem_child), GDK_KEY_r, GDK_CONTROL_MASK);
264+
#endif
259265
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
260266

261267

@@ -511,8 +517,9 @@ static GtkWidget *create_analyzer_menu(GtkAccelGroup *accel_group)
511517
gtk_menu_shell_append(GTK_MENU_SHELL(menu),menuitem);
512518

513519
menuitem = gtk_menu_item_new_with_label("Load a script");
514-
// FIXME:
515-
// gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem),gtk_image_new_from_icon_name("document-open",GTK_ICON_SIZE_MENU));
520+
/* FIXME:
521+
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem),gtk_image_new_from_icon_name("document-open",GTK_ICON_SIZE_MENU));
522+
*/
516523
g_signal_connect(GTK_WIDGET(menuitem),"activate",G_CALLBACK(menu_cardview_analyzer_load_cb),NULL);
517524

518525
gtk_widget_add_accelerator(menuitem, "activate", accel_group, GDK_KEY_l, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);

‎ui/gtk/gui_toolbar.c‎

Lines changed: 35 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -75,50 +75,43 @@ static void gui_widget_table_insert(const gchar *name, const GtkWidget *widget)
7575
GtkWidget *gui_toolbar_new(toolbar_item_t *tbitems)
7676
{
7777
GtkWidget *icon;
78-
GtkWidget *toolbar;
79-
GtkToolItem *item;
80-
int i;
81-
82-
toolbar = gtk_toolbar_new();
83-
84-
gtk_orientable_set_orientation (GTK_ORIENTABLE (toolbar), GTK_ORIENTATION_HORIZONTAL );
85-
gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH);
86-
87-
for (i=0; tbitems[i].icon!=NULL; i++)
88-
{
89-
if (strcmp(tbitems[i].icon,TOOLBAR_ITEM_SEPARATOR)==0)
90-
{
91-
item = gtk_separator_tool_item_new();
92-
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item),-1);
93-
94-
}
95-
else if (strcmp(tbitems[i].icon,TOOLBAR_ITEM_EXPANDER)==0)
96-
{
97-
item = gtk_separator_tool_item_new();
98-
gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM(item),FALSE);
99-
gtk_tool_item_set_expand(GTK_TOOL_ITEM(item),TRUE);
100-
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item),-1);
101-
102-
}
103-
else
104-
{
78+
GtkWidget *toolbar;
79+
GtkToolItem *item;
80+
int i;
81+
82+
toolbar = gtk_toolbar_new();
83+
84+
gtk_orientable_set_orientation (GTK_ORIENTABLE (toolbar), GTK_ORIENTATION_HORIZONTAL );
85+
gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH);
86+
87+
for (i=0; tbitems[i].icon!=NULL; i++)
88+
{
89+
if (strcmp(tbitems[i].icon,TOOLBAR_ITEM_SEPARATOR)==0)
90+
{
91+
item = gtk_separator_tool_item_new();
92+
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item),-1);
93+
94+
}
95+
else if (strcmp(tbitems[i].icon,TOOLBAR_ITEM_EXPANDER)==0)
96+
{
97+
item = gtk_separator_tool_item_new();
98+
gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM(item),FALSE);
99+
gtk_tool_item_set_expand(GTK_TOOL_ITEM(item),TRUE);
100+
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item),-1);
101+
102+
}
103+
else
104+
{
105105
icon = gtk_image_new_from_icon_name(tbitems[i].icon, GTK_ICON_SIZE_LARGE_TOOLBAR);
106-
//item = gtk_tool_button_new_from_stock (tbitems[i].icon);
107106
item = gtk_tool_button_new(icon, tbitems[i].text);
108-
//if (tbitems[i].text)
109-
// gtk_tool_button_set_label(GTK_TOOL_BUTTON(item),tbitems[i].text);
110-
if (tbitems[i].callback)
111-
g_signal_connect(G_OBJECT(item),"clicked",G_CALLBACK(tbitems[i].callback),(gpointer)tbitems[i].callback_data);
112-
if (tbitems[i].tooltip)
113-
gtk_widget_set_tooltip_text(GTK_WIDGET(item),tbitems[i].tooltip);
114-
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item),-1);
115-
}
116-
/*
117-
if (tbitems[i].id)
118-
gui_widget_table_insert(tbitems[i].id, GTK_WIDGET(item));
119-
*/
120-
}
121-
return toolbar;
107+
if (tbitems[i].callback)
108+
g_signal_connect(G_OBJECT(item),"clicked",G_CALLBACK(tbitems[i].callback),(gpointer)tbitems[i].callback_data);
109+
if (tbitems[i].tooltip)
110+
gtk_widget_set_tooltip_text(GTK_WIDGET(item),tbitems[i].tooltip);
111+
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item),-1);
112+
}
113+
}
114+
return toolbar;
122115
}
123116

124117
void gui_toolbar_run_command_cb(GtkWidget *w, gconstpointer user_data)

0 commit comments

Comments
 (0)