X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46b8d15a67701e1a2594b0eca820f166645e1b31..8a31648287be0ef976f133de2786b137f1e98340:/src/gtk/statbox.cpp?ds=sidebyside

diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index 6da1bb6c66..56cd02327b 100644
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/statbox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        gtk/statbox.cpp
+// Name:        src/gtk/statbox.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -16,6 +16,7 @@
 #include "wx/gtk/private/win_gtk.h"     // for wxPizza
 
 #include <gtk/gtk.h>
+#include "wx/gtk/private/gtk2-compat.h"
 
 // constants taken from GTK sources
 #define LABEL_PAD 1
@@ -31,15 +32,16 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc, void*)
     // clip label as GTK >= 2.12 does
     GtkWidget* label_widget = gtk_frame_get_label_widget(GTK_FRAME(widget));
     int w = alloc->width -
-        2 * widget->style->xthickness - 2 * LABEL_PAD - 2 * LABEL_SIDE_PAD;
+        2 * gtk_widget_get_style(widget)->xthickness - 2 * LABEL_PAD - 2 * LABEL_SIDE_PAD;
     if (w < 0)
         w = 0;
 
-    if (label_widget->allocation.width > w)
+    GtkAllocation a;
+    gtk_widget_get_allocation(label_widget, &a);
+    if (a.width > w)
     {
-        GtkAllocation alloc2 = label_widget->allocation;
-        alloc2.width = w;
-        gtk_widget_size_allocate(label_widget, &alloc2);
+        a.width = w;
+        gtk_widget_size_allocate(label_widget, &a);
     }
 }
 }
@@ -48,8 +50,6 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc, void*)
 // wxStaticBox
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
-
 wxStaticBox::wxStaticBox()
 {
 }
@@ -114,7 +114,7 @@ void wxStaticBox::AddChild( wxWindowBase *child )
     {
         // make this window a container of other wxWindows by instancing a wxPizza
         // and packing it into the GtkFrame:
-        m_wxwindow = wxPizza::New( 0 );
+        m_wxwindow = wxPizza::New();
         gtk_widget_show( m_wxwindow );
         gtk_container_add( GTK_CONTAINER (m_widget), m_wxwindow );
     }