projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1) some cleanup in wxHtmlWindow, moved private structures out of headers
[wxWidgets.git]
/
src
/
gtk1
/
statbox.cpp
diff --git
a/src/gtk1/statbox.cpp
b/src/gtk1/statbox.cpp
index d1c978b2ef4de609ba58bf6e40b8ca3817c61a1e..7afc40103d6317e3272bbc4dcdcc6e04153a8478 100644
(file)
--- a/
src/gtk1/statbox.cpp
+++ b/
src/gtk1/statbox.cpp
@@
-13,6
+13,8
@@
#include "wx/statbox.h"
#include "wx/statbox.h"
+#if wxUSE_STATBOX
+
#include "gdk/gdk.h"
#include "gtk/gtk.h"
#include "gdk/gdk.h"
#include "gtk/gtk.h"
@@
-39,11
+41,19
@@
bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label
{
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_isStaticBox = TRUE;
- m_widget = gtk_frame_new(m_label.mbc_str());
+ if (label.IsEmpty())
+ m_widget = gtk_frame_new( (char*) NULL );
+ else
+ m_widget = gtk_frame_new( m_label.mbc_str() );
m_parent->DoAddChild( this );
m_parent->DoAddChild( this );
@@
-51,9
+61,10
@@
bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label
SetLabel(label);
SetLabel(label);
+ SetFont( parent->GetFont() );
+
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
- SetFont( parent->GetFont() );
Show( TRUE );
Show( TRUE );
@@
-72,3
+83,5
@@
void wxStaticBox::ApplyWidgetStyle()
SetWidgetStyle();
gtk_widget_set_style( m_widget, m_widgetStyle );
}
SetWidgetStyle();
gtk_widget_set_style( m_widget, m_widgetStyle );
}
+
+#endif