Tinderbox build fix.

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

diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index 59282af9917f5ac38b44b0bb7f28d96e614ae901..bb499a7cda03c64148d1ee434652708c98650df5 100644 (file)
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/statbox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        statbox.cpp
+// Name:        gtk/statbox.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,61 +7,113 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "statbox.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_STATBOX

 
 #include "wx/statbox.h"
 
 #include "wx/statbox.h"

+#include "wx/gtk/private.h"
+
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"

 
 //-----------------------------------------------------------------------------
 // wxStaticBox
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxStaticBox
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxStaticBox,wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)

 
 

-wxStaticBox::wxStaticBox(void)
+wxStaticBox::wxStaticBox()

 {
 }
 
 {
 }
 

-wxStaticBox::wxStaticBox( wxWindow *parent, wxWindowID id, const wxString &label,
-      const wxPoint &pos, const wxSize &size,
-      long style, const wxString &name )
+wxStaticBox::wxStaticBox( wxWindow *parent,
+                          wxWindowID id,
+                          const wxString &label,
+                          const wxPoint& pos,
+                          const wxSize& size,
+                          long style,
+                          const wxString& name )

 {
 {

-  Create( parent, id, label, pos, size, style, name );
+    Create( parent, id, label, pos, size, style, name );

 }
 
 }
 

-bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label,
-      const wxPoint &pos, const wxSize &size,
-      long style, const wxString &name )
+bool wxStaticBox::Create( wxWindow *parent,
+                          wxWindowID id,
+                          const wxString& label,
+                          const wxPoint& pos,
+                          const wxSize& size,
+                          long style,
+                          const wxString& name )

 {
 {

-  m_needParent = TRUE;
+    m_needParent = TRUE;
+
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+    {
+        wxFAIL_MSG( wxT("wxStaticBox creation failed") );
+        return FALSE;
+    }
+
+    m_widget = GTKCreateFrame(label);
+    wxControl::SetLabel(label);
+
+    m_parent->DoAddChild( this );

 
 

-  PreCreation( parent, id, pos, size, style, name );
+    PostCreation(size);
+
+    // need to set non default alignment?
+    gfloat xalign;
+    if ( style & wxALIGN_CENTER )
+        xalign = 0.5;
+    else if ( style & wxALIGN_RIGHT )
+        xalign = 1.0;
+    else // wxALIGN_LEFT
+        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;
+}

 
 

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

 
 

-  PostCreation();
+    GTKSetLabelForFrame(GTK_FRAME(m_widget), label);
+}

 
 

-  SetLabel(label);
-  
-  SetBackgroundColour( parent->GetBackgroundColour() );
-  SetForegroundColour( parent->GetForegroundColour() );
+void wxStaticBox::DoApplyWidgetStyle(GtkRcStyle *style)
+{
+    GTKFrameApplyWidgetStyle(GTK_FRAME(m_widget), style);
+}

 
 

-  Show( TRUE );
+bool wxStaticBox::GTKWidgetNeedsMnemonic() const
+{
+    return true;
+}

 
 

-  return TRUE;
+void wxStaticBox::GTKWidgetDoSetMnemonic(GtkWidget* w)
+{
+    GTKFrameSetMnemonicWidget(GTK_FRAME(m_widget), w);

 }
 
 }
 

-void wxStaticBox::SetLabel( const wxString &label )
+// static
+wxVisualAttributes
+wxStaticBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))

 {
 {

-  wxControl::SetLabel( label );
-  GtkFrame *frame = GTK_FRAME( m_widget );
-  gtk_frame_set_label( frame, GetLabel() );
+    return GetDefaultAttributesFromGTKWidget(gtk_frame_new);

 }
 
 }
 

-void wxStaticBox::ApplyWidgetStyle()
+
+void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const

 {
 {

-  SetWidgetStyle();
-  gtk_widget_set_style( m_widget, m_widgetStyle );
+    const int BORDER = 5; // FIXME: hardcoded value
+
+    *borderTop = GetLabel().empty() ? 2*BORDER : GetCharHeight();
+    *borderOther = BORDER;

 }
 
 }
 

+#endif // wxUSE_STATBOX