diff options
Diffstat (limited to 'src/ink-comboboxentry-action.cpp')
| -rw-r--r-- | src/ink-comboboxentry-action.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/ink-comboboxentry-action.cpp b/src/ink-comboboxentry-action.cpp index 14f8f83a6..d9b1b0965 100644 --- a/src/ink-comboboxentry-action.cpp +++ b/src/ink-comboboxentry-action.cpp @@ -361,16 +361,8 @@ GtkWidget* create_tool_item( GtkAction* action ) item = GTK_WIDGET( gtk_tool_item_new() ); - GtkWidget* comboBoxEntry; - -// Backward-compatibility: GtkComboBoxEntry is deprecated in GTK+ >= 2.24 -// gtk_combo_box_set_entry_text_column is unavailable in earlier versions -#if GTK_CHECK_VERSION (2, 24, 0) - comboBoxEntry = gtk_combo_box_new_with_model_and_entry (ink_comboboxentry_action->model); + GtkWidget* comboBoxEntry = gtk_combo_box_new_with_model_and_entry (ink_comboboxentry_action->model); gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (comboBoxEntry), 0); -#else - comboBoxEntry = gtk_combo_box_entry_new_with_model( ink_comboboxentry_action->model, 0 ); -#endif // Name it so we can muck with it using an RC file gtk_widget_set_name( comboBoxEntry, combobox_name ); @@ -796,7 +788,7 @@ static void ink_comboboxentry_action_defocus( Ink_ComboBoxEntry_Action* action ) } } -gboolean keypress_cb( GtkWidget *widget, GdkEventKey *event, gpointer data ) +gboolean keypress_cb( GtkWidget * /*widget*/, GdkEventKey *event, gpointer data ) { gboolean wasConsumed = FALSE; /* default to report event not consumed */ guint key = 0; |