Fix a number of mingw compile errors.

[wxWidgets.git] / src / gtk / statbox.cpp

diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index 7115010262a363e8e39c3f0f24e9c8b25148c90f..56cd02327be62225ca664c7e0ef1bed8693dc104 100644 (file)
--- 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$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -13,8 +13,10 @@
 #if wxUSE_STATBOX
 
 #include "wx/statbox.h"
 #if wxUSE_STATBOX
 
 #include "wx/statbox.h"

+#include "wx/gtk/private/win_gtk.h"     // for wxPizza

 
 #include <gtk/gtk.h>
 
 #include <gtk/gtk.h>

+#include "wx/gtk/private/gtk2-compat.h"

 
 // constants taken from GTK sources
 #define LABEL_PAD 1
 
 // constants taken from GTK sources
 #define LABEL_PAD 1


@@ -30,13 +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 -
     // 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;
-    if (w < 0) w = 0;
-    if (label_widget->allocation.width > w)
+        2 * gtk_widget_get_style(widget)->xthickness - 2 * LABEL_PAD - 2 * LABEL_SIDE_PAD;
+    if (w < 0)
+        w = 0;
+
+    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);

     }
 }
 }
     }
 }
 }


@@ -45,8 +50,6 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc, void*)
 // wxStaticBox
 //-----------------------------------------------------------------------------
 
 // wxStaticBox
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
-

 wxStaticBox::wxStaticBox()
 {
 }
 wxStaticBox::wxStaticBox()
 {
 }


@@ -78,6 +81,8 @@ bool wxStaticBox::Create( wxWindow *parent,
     }
 
     m_widget = GTKCreateFrame(label);
     }
 
     m_widget = GTKCreateFrame(label);

+    g_object_ref(m_widget);
+

     // only base SetLabel needs to be called after GTKCreateFrame
     wxControl::SetLabel(label);
 
     // only base SetLabel needs to be called after GTKCreateFrame
     wxControl::SetLabel(label);
 


@@ -96,14 +101,27 @@ bool wxStaticBox::Create( wxWindow *parent,
 
     if (gtk_check_version(2, 12, 0))
     {
 
     if (gtk_check_version(2, 12, 0))
     {

-        // for clipping label as GTK >= 2.12 does
-        g_signal_connect(m_widget, "size_allocate",
-            G_CALLBACK(size_allocate), NULL);
+        // 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);

     }
 
     return true;
 }
 
     }
 
     return true;
 }
 

+void wxStaticBox::AddChild( wxWindowBase *child )
+{
+    if (!m_wxwindow)
+    {
+        // make this window a container of other wxWindows by instancing a wxPizza
+        // and packing it into the GtkFrame:
+        m_wxwindow = wxPizza::New();
+        gtk_widget_show( m_wxwindow );
+        gtk_container_add( GTK_CONTAINER (m_widget), m_wxwindow );
+    }
+
+    wxWindow::AddChild( child );
+}
+

 void wxStaticBox::SetLabel( const wxString& label )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid staticbox") );
 void wxStaticBox::SetLabel( const wxString& label )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid staticbox") );