projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxX11:
[wxWidgets.git]
/
src
/
gtk
/
statbox.cpp
diff --git
a/src/gtk/statbox.cpp
b/src/gtk/statbox.cpp
index 0d4f598a2ae6457ad6288c9daef50af5a7a6fcbe..fdc5f6eb5e50911d2249b35679c0d24f13616e09 100644
(file)
--- a/
src/gtk/statbox.cpp
+++ b/
src/gtk/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$
@@
-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"
@@
-22,46
+24,67
@@
// 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;
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
{
{
m_needParent = TRUE;
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
{
- wxFAIL_MSG( T("wxStaticBox creation failed") );
- return FALSE;
+ wxFAIL_MSG(
wx
T("wxStaticBox creation failed") );
+
return FALSE;
}
m_isStaticBox = TRUE;
}
m_isStaticBox = TRUE;
-
- m_widget = gtk_frame_new(m_label.mbc_str());
+
+ if (label.empty())
+ 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);
-
- SetBackgroundColour( parent->GetBackgroundColour() );
- SetForegroundColour( parent->GetForegroundColour() );
- SetFont( parent->GetFont() );
+ InheritAttributes();
+
+ // 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;
+
+ if ( xalign )
+ gtk_frame_set_label_align(GTK_FRAME( m_widget ), xalign, 0.0);
+
Show( TRUE );
return TRUE;
Show( TRUE );
return TRUE;
@@
-70,8
+93,8
@@
bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label
void wxStaticBox::SetLabel( const wxString &label )
{
wxControl::SetLabel( label );
void wxStaticBox::SetLabel( const wxString &label )
{
wxControl::SetLabel( label );
- GtkFrame *frame = GTK_FRAME( m_widget );
- gtk_frame_set_label(
frame
, GetLabel().mbc_str() );
+
+ gtk_frame_set_label(
GTK_FRAME( m_widget )
, GetLabel().mbc_str() );
}
void wxStaticBox::ApplyWidgetStyle()
}
void wxStaticBox::ApplyWidgetStyle()
@@
-80,4
+103,4
@@
void wxStaticBox::ApplyWidgetStyle()
gtk_widget_set_style( m_widget, m_widgetStyle );
}
gtk_widget_set_style( m_widget, m_widgetStyle );
}
-#endif
+#endif
// wxUSE_STATBOX