projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added style parameter to wxPopupWindow ctors so they match the Create method.
[wxWidgets.git]
/
src
/
gtk1
/
statbox.cpp
diff --git
a/src/gtk1/statbox.cpp
b/src/gtk1/statbox.cpp
index d6a4a6852bbd139a6f24c8dcf4e0b7eae12521c8..febadd9639c1bc6988afd1e31b2194ed49c258e2 100644
(file)
--- a/
src/gtk1/statbox.cpp
+++ b/
src/gtk1/statbox.cpp
@@
-11,10
+11,12
@@
#pragma implementation "statbox.h"
#endif
#pragma implementation "statbox.h"
#endif
-#include "wx/
statbox
.h"
+#include "wx/
defs
.h"
#if wxUSE_STATBOX
#if wxUSE_STATBOX
+#include "wx/statbox.h"
+
#include "gdk/gdk.h"
#include "gtk/gtk.h"
#include "gdk/gdk.h"
#include "gtk/gtk.h"
@@
-45,22
+47,26
@@
bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label
!CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
{
wxFAIL_MSG( wxT("wxStaticBox creation failed") );
!CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
{
wxFAIL_MSG( wxT("wxStaticBox creation failed") );
- return FALSE;
+
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 );
-
+
PostCreation();
SetLabel(label);
PostCreation();
SetLabel(label);
-
+
+ SetFont( parent->GetFont() );
+
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
- SetFont( parent->GetFont() );
Show( TRUE );
Show( TRUE );
@@
-80,4
+86,4
@@
void wxStaticBox::ApplyWidgetStyle()
gtk_widget_set_style( m_widget, m_widgetStyle );
}
gtk_widget_set_style( m_widget, m_widgetStyle );
}
-#endif
+#endif
// wxUSE_STATBOX