projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Small warning fixes.
[wxWidgets.git]
/
src
/
gtk
/
statbox.cpp
diff --git
a/src/gtk/statbox.cpp
b/src/gtk/statbox.cpp
index d6a4a6852bbd139a6f24c8dcf4e0b7eae12521c8..d057ebbd4c92da5668ae7a6cfa65b585db59970a 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$
@@
-7,14
+7,18
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "statbox.h"
#endif
#pragma implementation "statbox.h"
#endif
-#include "wx/statbox.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
#if wxUSE_STATBOX
#if wxUSE_STATBOX
+#include "wx/statbox.h"
+#include "wx/gtk/private.h"
+
#include "gdk/gdk.h"
#include "gtk/gtk.h"
#include "gdk/gdk.h"
#include "gtk/gtk.h"
@@
-22,22
+26,30
@@
// 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;
@@
-45,24
+57,28
@@
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_widget = gtk_frame_new(m_label.
mbc_str()
);
+
wxControl::SetLabel(label)
;
+
+ m_widget = gtk_frame_new(m_label.
empty() ? (char *)NULL : (const char*) wxGTK_CONV( m_label )
);
m_parent->DoAddChild( this );
m_parent->DoAddChild( this );
-
- PostCreation();
- SetLabel(label);
-
- SetBackgroundColour( parent->GetBackgroundColour() );
- SetForegroundColour( parent->GetForegroundColour() );
- SetFont( parent->GetFont() );
+ PostCreation(size);
+
+ // 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 ( xalign )
+ gtk_frame_set_label_align(GTK_FRAME( m_widget ), xalign, 0.0);
return TRUE;
}
return TRUE;
}
@@
-70,14
+86,24
@@
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 ),
+ m_label.empty() ? (char *)NULL : (const char*) wxGTK_CONV( m_label ) );
}
}
-void wxStaticBox::
ApplyWidgetStyle(
)
+void wxStaticBox::
DoApplyWidgetStyle(GtkRcStyle *style
)
{
{
- SetWidgetStyle();
- gtk_widget_set_style( m_widget, m_widgetStyle );
+ gtk_widget_modify_style(m_widget, style);
+#ifdef __WXGTK20__
+ gtk_widget_modify_style(GTK_FRAME(m_widget)->label_widget, style);
+#endif
}
}
-#endif
+// static
+wxVisualAttributes
+wxStaticBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+ return GetDefaultAttributesFromGTKWidget(gtk_frame_new);
+}
+
+#endif // wxUSE_STATBOX