applying patch, fixes #10524

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

diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index 4e768e3b12354bf18e8c2c7618955f3e0a983155..20326248c207cf18595b95d2aba90f9f20bece73 100644 (file)
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/statbox.cpp
@@ -1,50 +1,146 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling

 // 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 <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
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxStaticBox,wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
+
+wxStaticBox::wxStaticBox()
+{
+}
+
+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 );
+}
+
+bool wxStaticBox::Create( wxWindow *parent,
+                          wxWindowID id,
+                          const wxString& label,
+                          const wxPoint& pos,
+                          const wxSize& size,
+                          long style,
+                          const wxString& name )
+{
+    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);
+    g_object_ref(m_widget);
+    // 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 = 0;
+    if ( style & wxALIGN_CENTER )
+        xalign = 0.5;
+    else if ( style & wxALIGN_RIGHT )
+        xalign = 1.0;
+
+    gtk_frame_set_label_align(GTK_FRAME(m_widget), xalign, 0.5);
+
+    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);
+    }

 
 

-wxStaticBox::wxStaticBox(void)
+    return true;
+}
+
+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)

 {
 {

-};
+    GTKFrameApplyWidgetStyle(GTK_FRAME(m_widget), style);
+}

 
 

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

 {
 {

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

 
 

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

 {
 {

-  m_needParent = TRUE;
+    GTKFrameSetMnemonicWidget(GTK_FRAME(m_widget), w);
+}

 
 

-  PreCreation( parent, id, pos, size, style, name );
+// static
+wxVisualAttributes
+wxStaticBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_frame_new);
+}

 
 

-  SetLabel(m_label);
-  m_widget = gtk_frame_new(m_label);

 
 

-  PostCreation();
+void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
+{
+    const int BORDER = 5; // FIXME: hardcoded value

 
 

-  Show( TRUE );
+    *borderTop = GetLabel().empty() ? 2*BORDER : GetCharHeight();
+    *borderOther = BORDER;
+}

 
 

-  return TRUE;
-};
+#endif // wxUSE_STATBOX