diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2013-01-04 09:35:53 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2013-01-04 09:35:53 +0000 |
| commit | f3ebae385211512a9cbd727b5aa532f6aa1b711b (patch) | |
| tree | 52dc68f71cc252254ffebdbcd1107d35aa9fa895 /src/ink-comboboxentry-action.cpp | |
| parent | Re-add omitted UI pref from prefences dialog rewrite (diff) | |
| download | inkscape-f3ebae385211512a9cbd727b5aa532f6aa1b711b.tar.gz inkscape-f3ebae385211512a9cbd727b5aa532f6aa1b711b.zip | |
ocaldialog: Use GtkSearchEntry in Gtk+ >= 3.6
(bzr r12008)
Diffstat (limited to 'src/ink-comboboxentry-action.cpp')
| -rw-r--r-- | src/ink-comboboxentry-action.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/ink-comboboxentry-action.cpp b/src/ink-comboboxentry-action.cpp index 14f8f83a6..8033d1fab 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 ); |