X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debe6624c1e9d4bf3243381153d1e173c849bcd8..096c9f9b986e3e614175efdbb880ef4f94283c42:/src/gtk/statbox.cpp?ds=sidebyside diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp index 319fe3ac93..c4d3cb49ed 100644 --- a/src/gtk/statbox.cpp +++ b/src/gtk/statbox.cpp @@ -2,10 +2,9 @@ // Name: statbox.cpp // Purpose: // Author: Robert Roebling -// Created: 01/02/97 -// Id: -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem -// Licence: wxWindows licence +// Id: $Id$ +// Copyright: (c) 1998 Robert Roebling +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -14,6 +13,9 @@ #include "wx/statbox.h" +#include "gdk/gdk.h" +#include "gtk/gtk.h" + //----------------------------------------------------------------------------- // wxStaticBox //----------------------------------------------------------------------------- @@ -22,28 +24,53 @@ IMPLEMENT_DYNAMIC_CLASS(wxStaticBox,wxControl) wxStaticBox::wxStaticBox(void) { -}; +} -wxStaticBox::wxStaticBox( wxWindow *parent, wxWindowID id, const wxString &label, - const wxPoint &pos, const wxSize &size, +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 ); -}; + Create( parent, id, label, pos, size, style, name ); +} -bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label, - const wxPoint &pos, const wxSize &size, +bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label, + const wxPoint &pos, const wxSize &size, long style, const wxString &name ) { - m_needParent = TRUE; - - PreCreation( parent, id, pos, size, style, name ); + m_needParent = TRUE; - m_widget = gtk_frame_new( label ); + PreCreation( parent, id, pos, size, style, name ); + + m_isStaticBox = TRUE; + + m_widget = gtk_frame_new(m_label.mbc_str()); + + m_parent->AddChild( this ); + + (m_parent->m_insertCallback)( m_parent, this ); - PostCreation(); + PostCreation(); + + SetLabel(label); - Show( TRUE ); - - return TRUE; -}; + SetBackgroundColour( parent->GetBackgroundColour() ); + SetForegroundColour( parent->GetForegroundColour() ); + SetFont( parent->GetFont() ); + + Show( TRUE ); + + return TRUE; +} + +void wxStaticBox::SetLabel( const wxString &label ) +{ + wxControl::SetLabel( label ); + GtkFrame *frame = GTK_FRAME( m_widget ); + gtk_frame_set_label( frame, GetLabel().mbc_str() ); +} + +void wxStaticBox::ApplyWidgetStyle() +{ + SetWidgetStyle(); + gtk_widget_set_style( m_widget, m_widgetStyle ); +}