projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implemented HasContainerColumns() for GTK+
[wxWidgets.git]
/
src
/
gtk1
/
statbox.cpp
diff --git
a/src/gtk1/statbox.cpp
b/src/gtk1/statbox.cpp
index 07c354e4c4e399efc4fafc5a045934eb784f3d5c..a2542e88e2b20362c15da953c20586179b9f42f4 100644
(file)
--- a/
src/gtk1/statbox.cpp
+++ b/
src/gtk1/statbox.cpp
@@
-7,15
+7,13
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "statbox.h"
-#endif
-
-#include "wx/defs.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
#if wxUSE_STATBOX
#include "wx/statbox.h"
#if wxUSE_STATBOX
#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"
@@
-58,15
+56,12
@@
bool wxStaticBox::Create( wxWindow *parent,
return FALSE;
}
return FALSE;
}
- m_widget = gtk_frame_new(m_label.empty() ? (char *)NULL : m_label.mbc_str());
+ m_widget = gtk_frame_new(NULL);
+ SetLabel(label);
m_parent->DoAddChild( this );
m_parent->DoAddChild( this );
- PostCreation();
-
- SetLabel(label);
-
- InheritAttributes();
+ PostCreation(size);
// need to set non default alignment?
gfloat xalign;
// need to set non default alignment?
gfloat xalign;
@@
-77,25
+72,29
@@
bool wxStaticBox::Create( wxWindow *parent,
else // wxALIGN_LEFT
xalign = 0.0;
else // wxALIGN_LEFT
xalign = 0.0;
- if ( xalign )
- gtk_frame_set_label_align(GTK_FRAME( m_widget ), 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 )
{
{
- wxControl::SetLabel( label );
+ wxCHECK_RET( m_widget != NULL, wxT("invalid staticbox") );
+
+ GTKSetLabelForFrame(GTK_FRAME(m_widget), label);
+}
- gtk_frame_set_label( GTK_FRAME( m_widget ), GetLabel().mbc_str() );
+void wxStaticBox::DoApplyWidgetStyle(GtkRcStyle *style)
+{
+ 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
}
#endif // wxUSE_STATBOX