X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4ea2d0d5731ee4ec3f4f7407d48eee719d10c50c..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/gtk/private/gtk2-compat.h?ds=sidebyside diff --git a/include/wx/gtk/private/gtk2-compat.h b/include/wx/gtk/private/gtk2-compat.h index 0c8c0bdf50..20e9358d90 100644 --- a/include/wx/gtk/private/gtk2-compat.h +++ b/include/wx/gtk/private/gtk2-compat.h @@ -3,7 +3,6 @@ // Purpose: Compatibility code for older GTK+ versions // Author: Vaclav Slavik // Created: 2011-03-25 -// RCS-ID: $Id$ // Copyright: (c) 2011 Vaclav Slavik // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -55,16 +54,13 @@ static inline gpointer wx_g_object_ref_sink(gpointer object) #define g_object_ref_sink wx_g_object_ref_sink // ---------------------------------------------------------------------------- -// the following were introduced in GTK+ 2.12 and GtkAboutDialog itself is not -// in 2.4 so skip this if we don't have it. -#if GTK_CHECK_VERSION(2,6,0) +// the following were introduced in GTK+ 2.12 static inline void wx_gtk_about_dialog_set_program_name(GtkAboutDialog* about, const gchar* name) { gtk_about_dialog_set_name(about, name); } #define gtk_about_dialog_set_program_name wx_gtk_about_dialog_set_program_name -#endif // 2.6.0 // ---------------------------------------------------------------------------- // the following were introduced in GTK+ 2.14 @@ -129,18 +125,6 @@ static inline guint16 wx_gtk_entry_get_text_length(GtkEntry* entry) } #define gtk_entry_get_text_length wx_gtk_entry_get_text_length -static inline GtkWidget* wx_gtk_font_selection_dialog_get_cancel_button(GtkFontSelectionDialog* fsd) -{ - return fsd->cancel_button; -} -#define gtk_font_selection_dialog_get_cancel_button wx_gtk_font_selection_dialog_get_cancel_button - -static inline GtkWidget* wx_gtk_font_selection_dialog_get_ok_button(GtkFontSelectionDialog* fsd) -{ - return fsd->ok_button; -} -#define gtk_font_selection_dialog_get_ok_button wx_gtk_font_selection_dialog_get_ok_button - static inline const guchar* wx_gtk_selection_data_get_data(GtkSelectionData* selection_data) { return selection_data->data;