diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2012-11-06 16:03:45 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-06 16:34:42 +0100 |
| commit | 15fc255c7c0a6a693c754734c39c37bd50b0634b (patch) | |
| tree | f6ede3093fdf1aefcac43c3550c32e1f4696eaed /src/widgets/styles/qgtkstyle_p.h | |
| parent | b73465550b9f15a27e30e924d316501344c8ed86 (diff) | |
QGtkStyle: GTK3 compatible combo boxes
Use gtk_combo_box_new_with_entry when gtk_combo_box_entry_new is not
available. The latter was deprecated since 2.24 and is no longer
available in GTK3.
Notice that gtk_combo_box_new_with_entry returns a GtkComboBox, whereas
the old gtk_combo_box_entry_new returned a GtkComboBoxEntry.
Change-Id: I4aa3c528c6e04967ed783fce72036acb6063445b
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src/widgets/styles/qgtkstyle_p.h')
| -rw-r--r-- | src/widgets/styles/qgtkstyle_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/widgets/styles/qgtkstyle_p.h b/src/widgets/styles/qgtkstyle_p.h index 762d779278..913fd48560 100644 --- a/src/widgets/styles/qgtkstyle_p.h +++ b/src/widgets/styles/qgtkstyle_p.h @@ -149,7 +149,9 @@ typedef GtkWidget* (*Ptr_gtk_separator_menu_item_new)(void); typedef GtkWidget* (*Ptr_gtk_check_menu_item_new_with_label)(const gchar *); typedef GtkWidget* (*Ptr_gtk_menu_bar_new)(void); typedef GtkWidget* (*Ptr_gtk_menu_new)(void); +typedef GtkWidget* (*Ptr_gtk_combo_box_new)(void); typedef GtkWidget* (*Ptr_gtk_combo_box_entry_new)(void); +typedef GtkWidget* (*Ptr_gtk_combo_box_new_with_entry)(void); typedef GtkWidget* (*Ptr_gtk_toolbar_new)(void); typedef GtkWidget* (*Ptr_gtk_spin_button_new)(GtkAdjustment*, double, int); typedef GtkWidget* (*Ptr_gtk_button_new)(void); @@ -169,7 +171,6 @@ typedef GtkToolItem* (*Ptr_gtk_separator_tool_item_new) (void); typedef GtkWidget* (*Ptr_gtk_entry_new)(void); typedef GtkWidget* (*Ptr_gtk_tree_view_new)(void); typedef GtkTreeViewColumn* (*Ptr_gtk_tree_view_get_column)(GtkTreeView *, gint); -typedef GtkWidget* (*Ptr_gtk_combo_box_new)(void); typedef GtkWidget* (*Ptr_gtk_frame_new)(const gchar *); typedef GtkWidget* (*Ptr_gtk_expander_new)(const gchar*); typedef GtkWidget* (*Ptr_gtk_statusbar_new)(void); @@ -409,6 +410,7 @@ public: static Ptr_gtk_tree_view_get_column gtk_tree_view_get_column; static Ptr_gtk_combo_box_new gtk_combo_box_new; static Ptr_gtk_combo_box_entry_new gtk_combo_box_entry_new; + static Ptr_gtk_combo_box_new_with_entry gtk_combo_box_new_with_entry; static Ptr_gtk_progress_bar_new gtk_progress_bar_new; static Ptr_gtk_container_add gtk_container_add; static Ptr_gtk_menu_shell_append gtk_menu_shell_append; |