Deprecate wxDC::{Begin,End}Drawing()

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

diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index 313a7ab44f8b343989e803e1f29232964dc20eaa..89c9c8adc3cf9c3e9409c271bc0aaa8d3049b73d 100644 (file)
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/statbox.cpp
@@ -56,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 );
 
@@ -73,26 +72,23 @@ bool wxStaticBox::Create( wxWindow *parent,
     else // wxALIGN_LEFT
         xalign = 0.0;
 
-    if ( xalign )
+    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);
 }
 
 void wxStaticBox::DoApplyWidgetStyle(GtkRcStyle *style)
 {
     gtk_widget_modify_style(m_widget, style);
-#ifdef __WXGTK20__
     gtk_widget_modify_style(GTK_FRAME(m_widget)->label_widget, style);
-#endif
 }
 
 // static