gdk_image_destroy -> g_object_unref (gdk_image_destroy is deprecated in favor of...

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

diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index 879e2bc579d1ceaad9741358e4411e8e86f277ff..4d3feeb72b0fa7675a13af950b2bfe45c6140b27 100644 (file)
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/statbox.cpp
@@ -7,10 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -60,10 +56,9 @@ bool wxStaticBox::Create( wxWindow *parent,
         return FALSE;
     }
 
         return FALSE;
     }
 

+    m_widget = GTKCreateFrame(label);

     wxControl::SetLabel(label);
 
     wxControl::SetLabel(label);
 

-    m_widget = gtk_frame_new(m_label.empty() ? (char *)NULL : (const char*) wxGTK_CONV( m_label ) );
-

     m_parent->DoAddChild( this );
 
     PostCreation(size);
     m_parent->DoAddChild( this );
 
     PostCreation(size);


@@ -77,24 +72,32 @@ bool wxStaticBox::Create( wxWindow *parent,
     else // wxALIGN_LEFT
         xalign = 0.0;
 
     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;
 }
 
 
     return TRUE;
 }
 

-void wxStaticBox::SetLabel( const wxString &label )
+void wxStaticBox::SetLabel( const wxString& label )
+{
+    wxCHECK_RET( m_widget != NULL, wxT("invalid staticbox") );
+
+    GTKSetLabelForFrame(GTK_FRAME(m_widget), label);
+}
+
+void wxStaticBox::DoApplyWidgetStyle(GtkRcStyle *style)

 {
 {

-    wxControl::SetLabel( label );
+    GTKFrameApplyWidgetStyle(GTK_FRAME(m_widget), style);
+}

 
 

-    gtk_frame_set_label( GTK_FRAME( m_widget ),
-                         m_label.empty() ? (char *)NULL : (const char*) wxGTK_CONV( m_label ) );
+bool wxStaticBox::GTKWidgetNeedsMnemonic() const
+{
+    return true;

 }
 
 }
 

-void wxStaticBox::ApplyWidgetStyle()
+void wxStaticBox::GTKWidgetDoSetMnemonic(GtkWidget* w)

 {
 {

-    SetWidgetStyle();
-    gtk_widget_set_style( m_widget, m_widgetStyle );
+    GTKFrameSetMnemonicWidget(GTK_FRAME(m_widget), w);

 }
 
 // static
 }
 
 // static