X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d522606d0a1dfd22bcdc1a386b3dca01fa985e3..261a9107f0ce372c61b1e8c634e98cf7ad59a91e:/src/gtk/statbox.cpp

diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index 879e2bc579..783d1315fa 100644
--- 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"
 
@@ -22,6 +18,49 @@
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// constants taken from GTK sources
+#define LABEL_PAD 1
+#define LABEL_SIDE_PAD 2
+
+//-----------------------------------------------------------------------------
+// "gtk_frame_size_allocate" signal
+//-----------------------------------------------------------------------------
+
+extern "C" {
+
+static void
+gtk_frame_size_allocate (GtkWidget     *widget,
+                         GtkAllocation *allocation,
+                         wxStaticBox *p)
+{
+    GtkFrame *frame = GTK_FRAME (widget);
+
+    // this handler gets called _after_ the GTK+'s own signal handler; thus we
+    // need to fix only the width of the GtkLabel
+    // (everything else has already been handled by the GTK+ signal handler).
+
+    if (frame->label_widget && GTK_WIDGET_VISIBLE (frame->label_widget))
+    {
+        GtkAllocation ca = frame->label_widget->allocation;
+
+        // we want the GtkLabel to not exceed maxWidth:
+        int maxWidth = allocation->width - 2*LABEL_SIDE_PAD - 2*LABEL_PAD;
+        maxWidth = wxMax(2, maxWidth);      // maxWidth must always be positive!
+
+        // truncate the label to the GtkFrame width...
+        ca.width = wxMin(ca.width, maxWidth);
+        gtk_widget_size_allocate(frame->label_widget, &ca);
+    }
+}
+
+}
+
+
 //-----------------------------------------------------------------------------
 // wxStaticBox
 //-----------------------------------------------------------------------------
@@ -51,19 +90,16 @@ 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;
     }
 
+    m_widget = GTKCreateFrame(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);
@@ -77,24 +113,37 @@ 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);
+
+    // in order to clip the label widget, we must connect to the size allocate
+    // signal of this GtkFrame after the default GTK+'s allocate size function
+    g_signal_connect_after (m_widget, "size_allocate",
+                            G_CALLBACK (gtk_frame_size_allocate), this);
 
     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") );
+
+    GTKSetLabelForFrame(GTK_FRAME(m_widget), label);
+}
 
-    gtk_frame_set_label( GTK_FRAME( m_widget ),
-                         m_label.empty() ? (char *)NULL : (const char*) wxGTK_CONV( m_label ) );
+void wxStaticBox::DoApplyWidgetStyle(GtkRcStyle *style)
+{
+    GTKFrameApplyWidgetStyle(GTK_FRAME(m_widget), style);
 }
 
-void wxStaticBox::ApplyWidgetStyle()
+bool wxStaticBox::GTKWidgetNeedsMnemonic() const
 {
-    SetWidgetStyle();
-    gtk_widget_set_style( m_widget, m_widgetStyle );
+    return true;
+}
+
+void wxStaticBox::GTKWidgetDoSetMnemonic(GtkWidget* w)
+{
+    GTKFrameSetMnemonicWidget(GTK_FRAME(m_widget), w);
 }
 
 // static
@@ -104,4 +153,13 @@ wxStaticBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
     return GetDefaultAttributesFromGTKWidget(gtk_frame_new);
 }
 
+
+void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
+{
+    const int BORDER = 5; // FIXME: hardcoded value
+
+    *borderTop = GetLabel().empty() ? 2*BORDER : GetCharHeight();
+    *borderOther = BORDER;
+}
+
 #endif // wxUSE_STATBOX