X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a481bbc3186566a480def4724eecc963bc83138f..f9aa52355eb0db3fd5ef366dbf37d01b32aa3eee:/src/gtk/assertdlg_gtk.cpp diff --git a/src/gtk/assertdlg_gtk.cpp b/src/gtk/assertdlg_gtk.cpp index 0adc44a408..4df435b37e 100644 --- a/src/gtk/assertdlg_gtk.cpp +++ b/src/gtk/assertdlg_gtk.cpp @@ -10,6 +10,9 @@ #include "wx/platform.h" #include #include "wx/gtk/assertdlg_gtk.h" +#include "wx/gtk/private/gtk2-compat.h" + +#include /* ---------------------------------------------------------------------------- Constants @@ -41,7 +44,9 @@ GtkWidget *gtk_assert_dialog_add_button_to (GtkBox *box, const gchar *label, /* add a stock icon inside it */ GtkWidget *image = gtk_image_new_from_stock (stock, GTK_ICON_SIZE_BUTTON); +#if GTK_CHECK_VERSION(2,6,0) gtk_button_set_image (GTK_BUTTON (button), image); +#endif /* add to the given (container) widget */ if (box) @@ -352,8 +357,8 @@ static void gtk_assert_dialog_init(GtkAssertDialog* dlg) dlg->callback = NULL; dlg->userdata = NULL; - /* the resizeable property of this window is modified by the expander: - when it's collapsed, the window must be non-resizeable! */ + /* the resizable property of this window is modified by the expander: + when it's collapsed, the window must be non-resizable! */ gtk_window_set_resizable (GTK_WINDOW (dlg), FALSE); gtk_widget_pop_composite_child (); gtk_widget_show_all (GTK_WIDGET(dlg));