Disable some wxWebView tests that fail on the buildbot but not locally.

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

diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index 009f4a5865bed45e0b5bf438e2778bcdc485004f..56cd02327be62225ca664c7e0ef1bed8693dc104 100644 (file)
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/statbox.cpp
@@ -1,58 +1,163 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        statbox.cpp
+// Name:        src/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 "wx/gtk/private/win_gtk.h"     // for wxPizza
+
+#include <gtk/gtk.h>
+#include "wx/gtk/private/gtk2-compat.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 * 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);
+    }
+}
+}

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

-IMPLEMENT_DYNAMIC_CLASS(wxStaticBox,wxControl)
+wxStaticBox::wxStaticBox()
+{
+}

 
 

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

 }
 
 }
 

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

 {
 {

-  Create( parent, id, label, pos, size, style, name );
+    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 );
+    }
+
+    wxWindow::AddChild( child );

 }
 
 }
 

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

 {
 {

-  m_needParent = TRUE;
+    wxCHECK_RET( m_widget != NULL, wxT("invalid staticbox") );

 
 

-  PreCreation( parent, id, pos, size, style, name );
+    GTKSetLabelForFrame(GTK_FRAME(m_widget), label);
+}

 
 

-  m_widget = gtk_frame_new(m_label);
+void wxStaticBox::DoApplyWidgetStyle(GtkRcStyle *style)
+{
+    GTKFrameApplyWidgetStyle(GTK_FRAME(m_widget), style);
+}

 
 

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

 
 

-  SetLabel(label);
-  
-  Show( TRUE );
+void wxStaticBox::GTKWidgetDoSetMnemonic(GtkWidget* w)
+{
+    GTKFrameSetMnemonicWidget(GTK_FRAME(m_widget), w);
+}

 
 

-  return TRUE;
+// static
+wxVisualAttributes
+wxStaticBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_frame_new);

 }
 
 }
 

-void wxStaticBox::SetLabel( const wxString &label )
+
+void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const

 {
 {

-  wxControl::SetLabel( label );
-  GtkFrame *frame = GTK_FRAME( m_widget );
-  gtk_frame_set_label( frame, GetLabel() );
+    const int BORDER = 5; // FIXME: hardcoded value
+
+    *borderTop = GetLabel().empty() ? 2*BORDER : GetCharHeight();
+    *borderOther = BORDER;

 }
 }

+
+#endif // wxUSE_STATBOX