X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe161a2685012cf90bb5bfe95f2260aee71d8ad7..bf2c43c76e2819be443ab1d830ab68d9569d66b1:/src/gtk/statbox.cpp

diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index 9d489265d8..6d0a9b0db1 100644
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/statbox.cpp
@@ -1,32 +1,55 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        gtk/statbox.cpp
+// Name:        src/gtk/statbox.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // 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"
 
 #if wxUSE_STATBOX
 
 #include "wx/statbox.h"
-#include "wx/gtk/private.h"
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gtk/gtk.h>
+#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/win_gtk.h"
+
+// constants taken from GTK sources
+#define LABEL_PAD 1
+#define LABEL_SIDE_PAD 2
 
 //-----------------------------------------------------------------------------
-// wxStaticBox
+// "size_allocate" from m_widget
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
+#ifndef __WXGTK3__
+extern "C" {
+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 -
+        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)
+    {
+        a.width = w;
+        gtk_widget_size_allocate(label_widget, &a);
+    }
+}
+}
+#endif
+
+//-----------------------------------------------------------------------------
+// wxStaticBox
+//-----------------------------------------------------------------------------
 
 wxStaticBox::wxStaticBox()
 {
@@ -51,52 +74,92 @@ bool wxStaticBox::Create( wxWindow *parent,
                           long style,
                           const wxString& name )
 {
-    m_needParent = TRUE;
-
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {
         wxFAIL_MSG( wxT("wxStaticBox creation failed") );
-        return FALSE;
+        return false;
     }
 
-    wxControl::SetLabel(label);
+    m_widget = GTKCreateFrame(label);
+    g_object_ref(m_widget);
 
-    m_widget = gtk_frame_new(m_label.empty() ? (char *)NULL : (const char*) wxGTK_CONV( m_label ) );
+    // only base SetLabel needs to be called after GTKCreateFrame
+    wxControl::SetLabel(label);
 
     m_parent->DoAddChild( this );
 
     PostCreation(size);
 
     // need to set non default alignment?
-    gfloat xalign;
+    gfloat xalign = 0;
     if ( style & wxALIGN_CENTER )
         xalign = 0.5;
     else if ( style & wxALIGN_RIGHT )
         xalign = 1.0;
-    else // wxALIGN_LEFT
-        xalign = 0.0;
 
-    if ( xalign )
-        gtk_frame_set_label_align(GTK_FRAME( m_widget ), xalign, 0.0);
+    gtk_frame_set_label_align(GTK_FRAME(m_widget), xalign, 0.5);
+
+#ifndef __WXGTK3__
+    if (gtk_check_version(2, 12, 0))
+    {
+        // 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);
+    }
+#endif
+
+    m_container.DisableSelfFocus();
+
+    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 );
+    }
+
+    wxStaticBoxBase::AddChild(child);
+}
+
+void wxStaticBox::SetLabel( const wxString& label )
+{
+    wxCHECK_RET( m_widget != NULL, wxT("invalid staticbox") );
 
-    return TRUE;
+    GTKSetLabelForFrame(GTK_FRAME(m_widget), label);
+}
+
+void wxStaticBox::DoApplyWidgetStyle(GtkRcStyle *style)
+{
+    GTKFrameApplyWidgetStyle(GTK_FRAME(m_widget), style);
 }
 
-void wxStaticBox::SetLabel( const wxString &label )
+bool wxStaticBox::GTKWidgetNeedsMnemonic() const
 {
-    wxControl::SetLabel( label );
+    return true;
+}
 
-    gtk_frame_set_label( GTK_FRAME( m_widget ),
-                         m_label.empty() ? (char *)NULL : (const char*) wxGTK_CONV( m_label ) );
-    PostSetLabel();
+void wxStaticBox::GTKWidgetDoSetMnemonic(GtkWidget* w)
+{
+    GTKFrameSetMnemonicWidget(GTK_FRAME(m_widget), w);
 }
 
 // static
 wxVisualAttributes
 wxStaticBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-    return GetDefaultAttributesFromGTKWidget(gtk_frame_new);
+    return GetDefaultAttributesFromGTKWidget(gtk_frame_new(""));
+}
+
+void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
+{
+    *borderTop = GetCharHeight();
+    *borderOther = GetCharWidth()/2;
 }
 
 #endif // wxUSE_STATBOX