A couple more.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp
index a3d1af0557c4058e513e2ac17c1842a7665a0f89..afbd61ee1ec1b8e51bae5b22555a212e091c9566 100644 (file)
--- a/src/gtk/spinbutt.cpp
+++ b/src/gtk/spinbutt.cpp
@@ -121,28 +121,28 @@ wxSpinButton::~wxSpinButton()
 
 int wxSpinButton::GetMin() const
 {
 
 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
 {
 
     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
 {
 
     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 )
 {
 
     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;
 
     float fpos = (float)value;
     m_oldPos = fpos;


@@ -155,7 +155,7 @@ void wxSpinButton::SetValue( int value )
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {
 
 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;
 
     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) )
 {
 
 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 );
 
     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)
 {
 }
   wxScrollEvent(commandType, id)
 {
 }

-
-

diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index 2bef39033731f9383cf3fdf6fa7754dff9eb8a66..c4d3cb49edafdc7a69dbe1c89ae06a6400f70f54 100644 (file)
--- 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_isStaticBox = TRUE;
     

-    m_widget = gtk_frame_new(m_label);
+    m_widget = gtk_frame_new(m_label.mbc_str());

 
     m_parent->AddChild( this );
 
 
     m_parent->AddChild( this );
 


@@ -66,7 +66,7 @@ void wxStaticBox::SetLabel( const wxString &label )
 {
     wxControl::SetLabel( label );
     GtkFrame *frame = GTK_FRAME( m_widget );
 {
     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()
 }
 
 void wxStaticBox::ApplyWidgetStyle()


@@ -74,4 +74,3 @@ void wxStaticBox::ApplyWidgetStyle()
     SetWidgetStyle();
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
     SetWidgetStyle();
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }

-

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index 721c31843dfd3731bcb1f5c41118564772552ea6..102a55b09ad85b2465e2e58ce2b90d7b1193c19c 100644 (file)
--- 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);
     // 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 )
 
     GtkJustification justify;
     if ( style & wxALIGN_CENTER )


@@ -103,7 +103,7 @@ void wxStaticText::SetLabel( const wxString &label )
 {
     wxControl::SetLabel(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
 
 
     // adjust the label size to the new label
 

diff --git a/src/gtk1/spinbutt.cpp b/src/gtk1/spinbutt.cpp
index a3d1af0557c4058e513e2ac17c1842a7665a0f89..afbd61ee1ec1b8e51bae5b22555a212e091c9566 100644 (file)
--- a/src/gtk1/spinbutt.cpp
+++ b/src/gtk1/spinbutt.cpp
@@ -121,28 +121,28 @@ wxSpinButton::~wxSpinButton()
 
 int wxSpinButton::GetMin() const
 {
 
 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
 {
 
     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
 {
 
     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 )
 {
 
     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;
 
     float fpos = (float)value;
     m_oldPos = fpos;


@@ -155,7 +155,7 @@ void wxSpinButton::SetValue( int value )
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {
 
 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;
 
     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) )
 {
 
 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 );
 
     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)
 {
 }
   wxScrollEvent(commandType, id)
 {
 }

-
-

diff --git a/src/gtk1/statbox.cpp b/src/gtk1/statbox.cpp
index 2bef39033731f9383cf3fdf6fa7754dff9eb8a66..c4d3cb49edafdc7a69dbe1c89ae06a6400f70f54 100644 (file)
--- 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_isStaticBox = TRUE;
     

-    m_widget = gtk_frame_new(m_label);
+    m_widget = gtk_frame_new(m_label.mbc_str());

 
     m_parent->AddChild( this );
 
 
     m_parent->AddChild( this );
 


@@ -66,7 +66,7 @@ void wxStaticBox::SetLabel( const wxString &label )
 {
     wxControl::SetLabel( label );
     GtkFrame *frame = GTK_FRAME( m_widget );
 {
     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()
 }
 
 void wxStaticBox::ApplyWidgetStyle()


@@ -74,4 +74,3 @@ void wxStaticBox::ApplyWidgetStyle()
     SetWidgetStyle();
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
     SetWidgetStyle();
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }

-

diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp
index 721c31843dfd3731bcb1f5c41118564772552ea6..102a55b09ad85b2465e2e58ce2b90d7b1193c19c 100644 (file)
--- 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);
     // 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 )
 
     GtkJustification justify;
     if ( style & wxALIGN_CENTER )


@@ -103,7 +103,7 @@ void wxStaticText::SetLabel( const wxString &label )
 {
     wxControl::SetLabel(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
 
 
     // adjust the label size to the new label