X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a19d4096a996ddc55859d49f25af5da9a76c6e9f..4e15d1caa03346c126015019c1fdf093033ef40b:/src/gtk/statbox.cpp diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp index 14e274453d..5cb14390ff 100644 --- a/src/gtk/statbox.cpp +++ b/src/gtk/statbox.cpp @@ -13,10 +13,10 @@ #if wxUSE_STATBOX #include "wx/statbox.h" -#include "wx/gtk/private/win_gtk.h" // for wxPizza #include #include "wx/gtk/private/gtk2-compat.h" +#include "wx/gtk/private/win_gtk.h" // constants taken from GTK sources #define LABEL_PAD 1 @@ -26,6 +26,7 @@ // "size_allocate" from m_widget //----------------------------------------------------------------------------- +#ifndef __WXGTK3__ extern "C" { static void size_allocate(GtkWidget* widget, GtkAllocation* alloc, void*) { @@ -45,6 +46,7 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc, void*) } } } +#endif //----------------------------------------------------------------------------- // wxStaticBox @@ -99,11 +101,13 @@ bool wxStaticBox::Create( wxWindow *parent, gtk_frame_set_label_align(GTK_FRAME(m_widget), xalign, 0.5); +#ifndef __WXGTK3__ if (gtk_check_version(2, 12, 0)) { // we connect this signal to perform label-clipping as GTK >= 2.12 does g_signal_connect(m_widget, "size_allocate", G_CALLBACK(size_allocate), NULL); } +#endif return true; }