From 9f15c5febf5b9ae6ba7a8d3793fa0a187fac1980 Mon Sep 17 00:00:00 2001 From: Ove Kaaven Date: Thu, 15 Apr 1999 13:24:06 +0000 Subject: [PATCH] A couple more. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/spinbutt.cpp | 14 ++++++-------- src/gtk/statbox.cpp | 5 ++--- src/gtk/stattext.cpp | 4 ++-- src/gtk1/spinbutt.cpp | 14 ++++++-------- src/gtk1/statbox.cpp | 5 ++--- src/gtk1/stattext.cpp | 4 ++-- 6 files changed, 20 insertions(+), 26 deletions(-) diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp index a3d1af0557..afbd61ee1e 100644 --- a/src/gtk/spinbutt.cpp +++ b/src/gtk/spinbutt.cpp @@ -121,28 +121,28 @@ wxSpinButton::~wxSpinButton() int wxSpinButton::GetMin() const { - wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" ); + wxCHECK_MSG( (m_widget != NULL), 0, _T("invalid spin button") ); return (int)ceil(m_adjust->lower); } int wxSpinButton::GetMax() const { - wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" ); + wxCHECK_MSG( (m_widget != NULL), 0, _T("invalid spin button") ); return (int)ceil(m_adjust->upper); } int wxSpinButton::GetValue() const { - wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" ); + wxCHECK_MSG( (m_widget != NULL), 0, _T("invalid spin button") ); return (int)ceil(m_adjust->value); } void wxSpinButton::SetValue( int value ) { - wxCHECK_RET( (m_widget != NULL), "invalid spin button" ); + wxCHECK_RET( (m_widget != NULL), _T("invalid spin button") ); float fpos = (float)value; m_oldPos = fpos; @@ -155,7 +155,7 @@ void wxSpinButton::SetValue( int value ) void wxSpinButton::SetRange(int minVal, int maxVal) { - wxCHECK_RET( (m_widget != NULL), "invalid spin button" ); + wxCHECK_RET( (m_widget != NULL), _T("invalid spin button") ); float fmin = (float)minVal; float fmax = (float)maxVal; @@ -174,7 +174,7 @@ void wxSpinButton::SetRange(int minVal, int maxVal) void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) ) { - wxCHECK_RET( (m_widget != NULL), "invalid spin button" ); + wxCHECK_RET( (m_widget != NULL), _T("invalid spin button") ); m_width = 16; gtk_widget_set_usize( m_widget, m_width, m_height ); @@ -201,5 +201,3 @@ wxSpinEvent::wxSpinEvent(wxEventType commandType, int id): wxScrollEvent(commandType, id) { } - - diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp index 2bef390337..c4d3cb49ed 100644 --- a/src/gtk/statbox.cpp +++ b/src/gtk/statbox.cpp @@ -43,7 +43,7 @@ bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label m_isStaticBox = TRUE; - m_widget = gtk_frame_new(m_label); + m_widget = gtk_frame_new(m_label.mbc_str()); m_parent->AddChild( this ); @@ -66,7 +66,7 @@ void wxStaticBox::SetLabel( const wxString &label ) { wxControl::SetLabel( label ); GtkFrame *frame = GTK_FRAME( m_widget ); - gtk_frame_set_label( frame, GetLabel() ); + gtk_frame_set_label( frame, GetLabel().mbc_str() ); } void wxStaticBox::ApplyWidgetStyle() @@ -74,4 +74,3 @@ void wxStaticBox::ApplyWidgetStyle() SetWidgetStyle(); gtk_widget_set_style( m_widget, m_widgetStyle ); } - diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp index 721c31843d..102a55b09a 100644 --- a/src/gtk/stattext.cpp +++ b/src/gtk/stattext.cpp @@ -57,7 +57,7 @@ bool wxStaticText::Create(wxWindow *parent, // because the label is not yet created and because SetLabel() has a side // effect of changing the control size which might not be desirable wxControl::SetLabel(label); - m_widget = gtk_label_new( m_label ); + m_widget = gtk_label_new( m_label.mbc_str() ); GtkJustification justify; if ( style & wxALIGN_CENTER ) @@ -103,7 +103,7 @@ void wxStaticText::SetLabel( const wxString &label ) { wxControl::SetLabel(label); - gtk_label_set( GTK_LABEL(m_widget), m_label ); + gtk_label_set( GTK_LABEL(m_widget), m_label.mbc_str() ); // adjust the label size to the new label diff --git a/src/gtk1/spinbutt.cpp b/src/gtk1/spinbutt.cpp index a3d1af0557..afbd61ee1e 100644 --- a/src/gtk1/spinbutt.cpp +++ b/src/gtk1/spinbutt.cpp @@ -121,28 +121,28 @@ wxSpinButton::~wxSpinButton() int wxSpinButton::GetMin() const { - wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" ); + wxCHECK_MSG( (m_widget != NULL), 0, _T("invalid spin button") ); return (int)ceil(m_adjust->lower); } int wxSpinButton::GetMax() const { - wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" ); + wxCHECK_MSG( (m_widget != NULL), 0, _T("invalid spin button") ); return (int)ceil(m_adjust->upper); } int wxSpinButton::GetValue() const { - wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" ); + wxCHECK_MSG( (m_widget != NULL), 0, _T("invalid spin button") ); return (int)ceil(m_adjust->value); } void wxSpinButton::SetValue( int value ) { - wxCHECK_RET( (m_widget != NULL), "invalid spin button" ); + wxCHECK_RET( (m_widget != NULL), _T("invalid spin button") ); float fpos = (float)value; m_oldPos = fpos; @@ -155,7 +155,7 @@ void wxSpinButton::SetValue( int value ) void wxSpinButton::SetRange(int minVal, int maxVal) { - wxCHECK_RET( (m_widget != NULL), "invalid spin button" ); + wxCHECK_RET( (m_widget != NULL), _T("invalid spin button") ); float fmin = (float)minVal; float fmax = (float)maxVal; @@ -174,7 +174,7 @@ void wxSpinButton::SetRange(int minVal, int maxVal) void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) ) { - wxCHECK_RET( (m_widget != NULL), "invalid spin button" ); + wxCHECK_RET( (m_widget != NULL), _T("invalid spin button") ); m_width = 16; gtk_widget_set_usize( m_widget, m_width, m_height ); @@ -201,5 +201,3 @@ wxSpinEvent::wxSpinEvent(wxEventType commandType, int id): wxScrollEvent(commandType, id) { } - - diff --git a/src/gtk1/statbox.cpp b/src/gtk1/statbox.cpp index 2bef390337..c4d3cb49ed 100644 --- a/src/gtk1/statbox.cpp +++ b/src/gtk1/statbox.cpp @@ -43,7 +43,7 @@ bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label m_isStaticBox = TRUE; - m_widget = gtk_frame_new(m_label); + m_widget = gtk_frame_new(m_label.mbc_str()); m_parent->AddChild( this ); @@ -66,7 +66,7 @@ void wxStaticBox::SetLabel( const wxString &label ) { wxControl::SetLabel( label ); GtkFrame *frame = GTK_FRAME( m_widget ); - gtk_frame_set_label( frame, GetLabel() ); + gtk_frame_set_label( frame, GetLabel().mbc_str() ); } void wxStaticBox::ApplyWidgetStyle() @@ -74,4 +74,3 @@ void wxStaticBox::ApplyWidgetStyle() SetWidgetStyle(); gtk_widget_set_style( m_widget, m_widgetStyle ); } - diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp index 721c31843d..102a55b09a 100644 --- a/src/gtk1/stattext.cpp +++ b/src/gtk1/stattext.cpp @@ -57,7 +57,7 @@ bool wxStaticText::Create(wxWindow *parent, // because the label is not yet created and because SetLabel() has a side // effect of changing the control size which might not be desirable wxControl::SetLabel(label); - m_widget = gtk_label_new( m_label ); + m_widget = gtk_label_new( m_label.mbc_str() ); GtkJustification justify; if ( style & wxALIGN_CENTER ) @@ -103,7 +103,7 @@ void wxStaticText::SetLabel( const wxString &label ) { wxControl::SetLabel(label); - gtk_label_set( GTK_LABEL(m_widget), m_label ); + gtk_label_set( GTK_LABEL(m_widget), m_label.mbc_str() ); // adjust the label size to the new label