projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Forgot DeleteChildren()
[wxWidgets.git]
/
src
/
gtk1
/
statbox.cpp
diff --git
a/src/gtk1/statbox.cpp
b/src/gtk1/statbox.cpp
index c4d3cb49edafdc7a69dbe1c89ae06a6400f70f54..a2542e88e2b20362c15da953c20586179b9f42f4 100644
(file)
--- a/
src/gtk1/statbox.cpp
+++ b/
src/gtk1/statbox.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: statbox.cpp
+// Name:
gtk/
statbox.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Purpose:
// Author: Robert Roebling
// Id: $Id$
@@
-7,11
+7,13
@@
// 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/gtk1/private.h"
#include "gdk/gdk.h"
#include "gtk/gtk.h"
#include "gdk/gdk.h"
#include "gtk/gtk.h"
@@
-20,57
+22,79
@@
// wxStaticBox
//-----------------------------------------------------------------------------
// wxStaticBox
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBox,wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxStaticBox,
wxControl)
-wxStaticBox::wxStaticBox(
void
)
+wxStaticBox::wxStaticBox()
{
}
{
}
-wxStaticBox::wxStaticBox( wxWindow *parent, wxWindowID id, const wxString &label,
- const wxPoint &pos, const wxSize &size,
- long style, const wxString &name )
+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,
- long style, const wxString &name )
+bool wxStaticBox::Create( wxWindow *parent,
+ wxWindowID id,
+ const wxString& label,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxString& name )
{
m_needParent = TRUE;
{
m_needParent = TRUE;
- PreCreation( parent, id, pos, size, style, name );
+ if (!PreCreation( parent, pos, size ) ||
+ !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+ {
+ wxFAIL_MSG( wxT("wxStaticBox creation failed") );
+ return FALSE;
+ }
- m_isStaticBox = TRUE;
-
- m_widget = gtk_frame_new(m_label.mbc_str());
+ m_widget = gtk_frame_new(NULL);
+ SetLabel(label);
- m_parent->AddChild( this );
+ m_parent->
Do
AddChild( this );
- (m_parent->m_insertCallback)( m_parent, this );
-
- PostCreation();
+ PostCreation(size);
- SetLabel(label);
-
- SetBackgroundColour( parent->GetBackgroundColour() );
- SetForegroundColour( parent->GetForegroundColour() );
- SetFont( parent->GetFont() );
+ // need to set non default alignment?
+ gfloat xalign;
+ if ( style & wxALIGN_CENTER )
+ xalign = 0.5;
+ else if ( style & wxALIGN_RIGHT )
+ xalign = 1.0;
+ else // wxALIGN_LEFT
+ xalign = 0.0;
- Show( TRUE );
+ if ( style & (wxALIGN_RIGHT | wxALIGN_CENTER) ) // left alignment is default
+ gtk_frame_set_label_align(GTK_FRAME( m_widget ), xalign, 0.5);
return TRUE;
}
return TRUE;
}
-void wxStaticBox::SetLabel( const wxString &label )
+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)
{
{
- wxControl::SetLabel( label );
- GtkFrame *frame = GTK_FRAME( m_widget );
- gtk_frame_set_label( frame, GetLabel().mbc_str() );
+ gtk_widget_modify_style(m_widget, style);
}
}
-void wxStaticBox::ApplyWidgetStyle()
+// static
+wxVisualAttributes
+wxStaticBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
{
{
- SetWidgetStyle();
- gtk_widget_set_style( m_widget, m_widgetStyle );
+ return GetDefaultAttributesFromGTKWidget(gtk_frame_new);
}
}
+
+#endif // wxUSE_STATBOX