honour wx{CLOSE,MINIMIZE,MAXIMIZE}_BOX even for borderless windows; also always allow...

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

diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index bb499a7cda03c64148d1ee434652708c98650df5..20326248c207cf18595b95d2aba90f9f20bece73 100644 (file)
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/statbox.cpp
@@ -13,10 +13,33 @@
 #if wxUSE_STATBOX
 
 #include "wx/statbox.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>
+
+// constants taken from GTK sources
+#define LABEL_PAD 1
+#define LABEL_SIDE_PAD 2
+
+//-----------------------------------------------------------------------------
+// "size_allocate" from m_widget
+//-----------------------------------------------------------------------------
+
+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 * widget->style->xthickness - 2 * LABEL_PAD - 2 * LABEL_SIDE_PAD;
+    if (w < 0) w = 0;
+    if (label_widget->allocation.width > w)
+    {
+        GtkAllocation alloc2 = label_widget->allocation;
+        alloc2.width = w;
+        gtk_widget_size_allocate(label_widget, &alloc2);
+    }
+}
+}

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


@@ -47,16 +70,16 @@ bool wxStaticBox::Create( wxWindow *parent,
                           long style,
                           const wxString& name )
 {
                           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") );
     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);
     }
 
     m_widget = GTKCreateFrame(label);

+    g_object_ref(m_widget);
+    // only base SetLabel needs to be called after GTKCreateFrame

     wxControl::SetLabel(label);
 
     m_parent->DoAddChild( this );
     wxControl::SetLabel(label);
 
     m_parent->DoAddChild( this );


@@ -64,18 +87,22 @@ bool wxStaticBox::Create( wxWindow *parent,
     PostCreation(size);
 
     // need to set non default alignment?
     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;
     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);
+    gtk_frame_set_label_align(GTK_FRAME(m_widget), xalign, 0.5);

 
 

-    return TRUE;
+    if (gtk_check_version(2, 12, 0))
+    {
+        // for clipping label as GTK >= 2.12 does
+        g_signal_connect(m_widget, "size_allocate",
+            G_CALLBACK(size_allocate), NULL);
+    }
+
+    return true;

 }
 
 void wxStaticBox::SetLabel( const wxString& label )
 }
 
 void wxStaticBox::SetLabel( const wxString& label )