Amebis/wxWidgets
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow windows which are placed inside wxStaticBoxes to be built as children of the wxStaticBox itself rather than forcing users to build them as siblings of the static box (closes #9859)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-04-25 10:49:36 +00:00
parent 74ed0fa155
commit 39cdc95fb3
6 changed files with 55 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/wincmn.cpp
View File

@@ -217,17 +217,6 @@ bool wxWindowBase::CreateBase(wxWindowBase *parent,
const wxValidator& wxVALIDATOR_PARAM(validator),
const wxString& name)
{
#if wxUSE_STATBOX
// wxGTK doesn't allow to create controls with static box as the parent so
// this will result in a crash when the program is ported to wxGTK so warn
// the user about it
// if you get this assert, the correct solution is to create the controls
// as siblings of the static box
wxASSERT_MSG( !parent || !wxDynamicCast(parent, wxStaticBox),
_T("wxStaticBox can't be used as a window parent!") );
#endif // wxUSE_STATBOX
// ids are limited to 16 bits under MSW so if you care about portability,
// it's not a good idea to use ids out of this range (and negative ids are
// reserved for wxWidgets own usage)

25
src/gtk/statbox.cpp
View File

@@ -13,6 +13,7 @@
#if wxUSE_STATBOX
#include "wx/statbox.h"
#include "wx/gtk/private/win_gtk.h" // for wxPizza
#include <gtk/gtk.h>
@@ -31,7 +32,9 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc, void*)
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 (w < 0)
w = 0;
if (label_widget->allocation.width > w)
{
GtkAllocation alloc2 = label_widget->allocation;
@@ -79,6 +82,7 @@ bool wxStaticBox::Create( wxWindow *parent,
m_widget = GTKCreateFrame(label);
g_object_ref(m_widget);
// only base SetLabel needs to be called after GTKCreateFrame
wxControl::SetLabel(label);
@@ -97,14 +101,27 @@ bool wxStaticBox::Create( wxWindow *parent,
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);
// 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;
}
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( 0, this );
gtk_widget_show( m_wxwindow );
gtk_container_add( GTK_CONTAINER (m_widget), m_wxwindow );
}
wxWindow::AddChild( child );
}
void wxStaticBox::SetLabel( const wxString& label )
{
wxCHECK_RET( m_widget != NULL, wxT("invalid staticbox") );