Allow wx parents a chance to handle events fired by non-wx children. (i.e. wxActiveX...

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

diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index a15681c0619017a1649d623c47a3340641d12c92..c000c1306aee609bd41a2c5f5e9929b222622b09 100644 (file)
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/statbox.cpp
@@ -7,10 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "statbox.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -60,9 +56,8 @@ bool wxStaticBox::Create( wxWindow *parent,
         return FALSE;
     }
 
-    wxControl::SetLabel(label);
-
-    m_widget = gtk_frame_new(m_label.empty() ? (char *)NULL : (const char*) wxGTK_CONV( m_label ) );
+    m_widget = gtk_frame_new(NULL);
+    SetLabel(label);
 
     m_parent->DoAddChild( this );
 
@@ -77,33 +72,25 @@ bool wxStaticBox::Create( wxWindow *parent,
     else // wxALIGN_LEFT
         xalign = 0.0;
 
-    if ( xalign )
-        gtk_frame_set_label_align(GTK_FRAME( m_widget ), xalign, 0.0);
+    if ( style & (wxALIGN_RIGHT | wxALIGN_CENTER) ) // left alignment is default
+        gtk_frame_set_label_align(GTK_FRAME( m_widget ), xalign, 0.5);
 
     return TRUE;
 }
 
-void wxStaticBox::SetLabel( const wxString &label )
+void wxStaticBox::SetLabel( const wxString& label )
 {
-    wxControl::SetLabel( label );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid staticbox") );
 
-    gtk_frame_set_label( GTK_FRAME( m_widget ),
-                         m_label.empty() ? (char *)NULL : (const char*) wxGTK_CONV( m_label ) );
+    GTKSetLabelForFrame(GTK_FRAME(m_widget), label);
 }
 
-bool wxStaticBox::SetFont( const wxFont &font )
+void wxStaticBox::DoApplyWidgetStyle(GtkRcStyle *style)
 {
-    wxControl::SetFont( font );
-
-    if (GTK_FRAME(m_widget)->label_widget)
-    {
-        GtkRcStyle *style = CreateWidgetStyle(true);
-        if ( style )
-        {
-            gtk_widget_modify_style( GTK_FRAME(m_widget)->label_widget, style);
-            gtk_rc_style_unref(style);
-        }
-    }
+    gtk_widget_modify_style(m_widget, style);
+#ifdef __WXGTK20__
+    gtk_widget_modify_style(GTK_FRAME(m_widget)->label_widget, style);
+#endif
 }
 
 // static