From: Ove Kaaven <ovek@arcticnet.no>
Date: Wed, 14 Apr 1999 20:23:46 +0000 (+0000)
Subject: This seems to be compiling.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/3bce7509838b4402927bca57a764954c868eb388

This seems to be compiling.


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

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index af6d56d598..07a3dac108 100644
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -71,10 +71,10 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
   
     SetValidator( validator );
 
-    m_widget = gtk_button_new_with_label( m_label );
+    m_widget = gtk_button_new_with_label( m_label.mbc_str() );
     SetLabel(label);
 
-    if (newSize.x == -1) newSize.x = 15+gdk_string_measure( m_widget->style->font, label );
+    if (newSize.x == -1) newSize.x = 15+gdk_string_measure( m_widget->style->font, label.mbc_str() );
     if (newSize.y == -1) newSize.y = 26;
     SetSize( newSize.x, newSize.y );
 
@@ -106,16 +106,16 @@ void wxButton::SetDefault(void)
 
 void wxButton::SetLabel( const wxString &label )
 {
-    wxCHECK_RET( m_widget != NULL, "invalid button" );
+    wxCHECK_RET( m_widget != NULL, _T("invalid button") );
   
     wxControl::SetLabel( label );
   
-    gtk_label_set( GTK_LABEL( GTK_BUTTON(m_widget)->child ), GetLabel() );
+    gtk_label_set( GTK_LABEL( GTK_BUTTON(m_widget)->child ), GetLabel().mbc_str() );
 }
 
 void wxButton::Enable( bool enable )
 {
-    wxCHECK_RET( m_widget != NULL, "invalid button" );
+    wxCHECK_RET( m_widget != NULL, _T("invalid button") );
   
     wxControl::Enable( enable );
   
@@ -128,5 +128,3 @@ void wxButton::ApplyWidgetStyle()
     gtk_widget_set_style( m_widget, m_widgetStyle );
     gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle );
 }
-
-
diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp
index 0412601c8b..d4023c5a04 100644
--- a/src/gtk/checkbox.cpp
+++ b/src/gtk/checkbox.cpp
@@ -81,7 +81,7 @@ bool wxCheckBox::Create(wxWindow *parent,
         //     left of it
         m_widgetCheckbox = gtk_check_button_new();
 
-        m_widgetLabel = gtk_label_new(m_label);
+        m_widgetLabel = gtk_label_new(m_label.mbc_str());
         gtk_misc_set_alignment(GTK_MISC(m_widgetLabel), 0.0, 0.5);
 
         m_widget = gtk_hbox_new(FALSE, 0);
@@ -94,7 +94,7 @@ bool wxCheckBox::Create(wxWindow *parent,
     }
     else
     {
-        m_widgetCheckbox = gtk_check_button_new_with_label( m_label );
+        m_widgetCheckbox = gtk_check_button_new_with_label( m_label.mbc_str() );
         m_widgetLabel = GTK_BUTTON( m_widgetCheckbox )->child;
         m_widget = m_widgetCheckbox;
     }
@@ -103,7 +103,7 @@ bool wxCheckBox::Create(wxWindow *parent,
     if (newSize.x == -1)
     {
         newSize.x = 25 + gdk_string_measure( m_widgetCheckbox->style->font,
-                                             m_label );
+                                             m_label.mbc_str() );
     }
     if (newSize.y == -1)
         newSize.y = 26;
@@ -135,7 +135,7 @@ bool wxCheckBox::Create(wxWindow *parent,
 
 void wxCheckBox::SetValue( bool state )
 {
-    wxCHECK_RET( m_widgetCheckbox != NULL, "invalid checkbox" );
+    wxCHECK_RET( m_widgetCheckbox != NULL, _T("invalid checkbox") );
 
     if ( state == GetValue() )
         return;
@@ -149,23 +149,23 @@ void wxCheckBox::SetValue( bool state )
 
 bool wxCheckBox::GetValue() const
 {
-    wxCHECK_MSG( m_widgetCheckbox != NULL, FALSE, "invalid checkbox" );
+    wxCHECK_MSG( m_widgetCheckbox != NULL, FALSE, _T("invalid checkbox") );
 
     return GTK_TOGGLE_BUTTON(m_widgetCheckbox)->active;
 }
 
 void wxCheckBox::SetLabel( const wxString& label )
 {
-    wxCHECK_RET( m_widgetLabel != NULL, "invalid checkbox" );
+    wxCHECK_RET( m_widgetLabel != NULL, _T("invalid checkbox") );
 
     wxControl::SetLabel( label );
 
-    gtk_label_set( GTK_LABEL(m_widgetLabel), GetLabel() );
+    gtk_label_set( GTK_LABEL(m_widgetLabel), GetLabel().mbc_str() );
 }
 
 void wxCheckBox::Enable( bool enable )
 {
-    wxCHECK_RET( m_widgetLabel != NULL, "invalid checkbox" );
+    wxCHECK_RET( m_widgetLabel != NULL, _T("invalid checkbox") );
 
     wxControl::Enable( enable );
 
diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index ce57fdf9a6..69e7a9a0b2 100644
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -39,14 +39,14 @@ void wxControl::Command( wxCommandEvent &WXUNUSED(event) )
 
 void wxControl::SetLabel( const wxString &label )
 {
-    m_label = "";
-    for ( const char *pc = label; *pc != '\0'; pc++ ) 
+    m_label = _T("");
+    for ( const wxChar *pc = label; *pc != _T('\0'); pc++ ) 
     {
-        if ( *pc == '&' ) 
+        if ( *pc == _T('&') ) 
 	{
             pc++; // skip it
 #if 0 // it would be unused anyhow for now - kbd interface not done yet
-            if ( *pc != '&' ) m_chAccel = *pc;
+            if ( *pc != _T('&') ) m_chAccel = *pc;
 #endif
         }
         m_label << *pc;
diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp
index af6d56d598..07a3dac108 100644
--- a/src/gtk1/button.cpp
+++ b/src/gtk1/button.cpp
@@ -71,10 +71,10 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
   
     SetValidator( validator );
 
-    m_widget = gtk_button_new_with_label( m_label );
+    m_widget = gtk_button_new_with_label( m_label.mbc_str() );
     SetLabel(label);
 
-    if (newSize.x == -1) newSize.x = 15+gdk_string_measure( m_widget->style->font, label );
+    if (newSize.x == -1) newSize.x = 15+gdk_string_measure( m_widget->style->font, label.mbc_str() );
     if (newSize.y == -1) newSize.y = 26;
     SetSize( newSize.x, newSize.y );
 
@@ -106,16 +106,16 @@ void wxButton::SetDefault(void)
 
 void wxButton::SetLabel( const wxString &label )
 {
-    wxCHECK_RET( m_widget != NULL, "invalid button" );
+    wxCHECK_RET( m_widget != NULL, _T("invalid button") );
   
     wxControl::SetLabel( label );
   
-    gtk_label_set( GTK_LABEL( GTK_BUTTON(m_widget)->child ), GetLabel() );
+    gtk_label_set( GTK_LABEL( GTK_BUTTON(m_widget)->child ), GetLabel().mbc_str() );
 }
 
 void wxButton::Enable( bool enable )
 {
-    wxCHECK_RET( m_widget != NULL, "invalid button" );
+    wxCHECK_RET( m_widget != NULL, _T("invalid button") );
   
     wxControl::Enable( enable );
   
@@ -128,5 +128,3 @@ void wxButton::ApplyWidgetStyle()
     gtk_widget_set_style( m_widget, m_widgetStyle );
     gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle );
 }
-
-
diff --git a/src/gtk1/checkbox.cpp b/src/gtk1/checkbox.cpp
index 0412601c8b..d4023c5a04 100644
--- a/src/gtk1/checkbox.cpp
+++ b/src/gtk1/checkbox.cpp
@@ -81,7 +81,7 @@ bool wxCheckBox::Create(wxWindow *parent,
         //     left of it
         m_widgetCheckbox = gtk_check_button_new();
 
-        m_widgetLabel = gtk_label_new(m_label);
+        m_widgetLabel = gtk_label_new(m_label.mbc_str());
         gtk_misc_set_alignment(GTK_MISC(m_widgetLabel), 0.0, 0.5);
 
         m_widget = gtk_hbox_new(FALSE, 0);
@@ -94,7 +94,7 @@ bool wxCheckBox::Create(wxWindow *parent,
     }
     else
     {
-        m_widgetCheckbox = gtk_check_button_new_with_label( m_label );
+        m_widgetCheckbox = gtk_check_button_new_with_label( m_label.mbc_str() );
         m_widgetLabel = GTK_BUTTON( m_widgetCheckbox )->child;
         m_widget = m_widgetCheckbox;
     }
@@ -103,7 +103,7 @@ bool wxCheckBox::Create(wxWindow *parent,
     if (newSize.x == -1)
     {
         newSize.x = 25 + gdk_string_measure( m_widgetCheckbox->style->font,
-                                             m_label );
+                                             m_label.mbc_str() );
     }
     if (newSize.y == -1)
         newSize.y = 26;
@@ -135,7 +135,7 @@ bool wxCheckBox::Create(wxWindow *parent,
 
 void wxCheckBox::SetValue( bool state )
 {
-    wxCHECK_RET( m_widgetCheckbox != NULL, "invalid checkbox" );
+    wxCHECK_RET( m_widgetCheckbox != NULL, _T("invalid checkbox") );
 
     if ( state == GetValue() )
         return;
@@ -149,23 +149,23 @@ void wxCheckBox::SetValue( bool state )
 
 bool wxCheckBox::GetValue() const
 {
-    wxCHECK_MSG( m_widgetCheckbox != NULL, FALSE, "invalid checkbox" );
+    wxCHECK_MSG( m_widgetCheckbox != NULL, FALSE, _T("invalid checkbox") );
 
     return GTK_TOGGLE_BUTTON(m_widgetCheckbox)->active;
 }
 
 void wxCheckBox::SetLabel( const wxString& label )
 {
-    wxCHECK_RET( m_widgetLabel != NULL, "invalid checkbox" );
+    wxCHECK_RET( m_widgetLabel != NULL, _T("invalid checkbox") );
 
     wxControl::SetLabel( label );
 
-    gtk_label_set( GTK_LABEL(m_widgetLabel), GetLabel() );
+    gtk_label_set( GTK_LABEL(m_widgetLabel), GetLabel().mbc_str() );
 }
 
 void wxCheckBox::Enable( bool enable )
 {
-    wxCHECK_RET( m_widgetLabel != NULL, "invalid checkbox" );
+    wxCHECK_RET( m_widgetLabel != NULL, _T("invalid checkbox") );
 
     wxControl::Enable( enable );
 
diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp
index ce57fdf9a6..69e7a9a0b2 100644
--- a/src/gtk1/control.cpp
+++ b/src/gtk1/control.cpp
@@ -39,14 +39,14 @@ void wxControl::Command( wxCommandEvent &WXUNUSED(event) )
 
 void wxControl::SetLabel( const wxString &label )
 {
-    m_label = "";
-    for ( const char *pc = label; *pc != '\0'; pc++ ) 
+    m_label = _T("");
+    for ( const wxChar *pc = label; *pc != _T('\0'); pc++ ) 
     {
-        if ( *pc == '&' ) 
+        if ( *pc == _T('&') ) 
 	{
             pc++; // skip it
 #if 0 // it would be unused anyhow for now - kbd interface not done yet
-            if ( *pc != '&' ) m_chAccel = *pc;
+            if ( *pc != _T('&') ) m_chAccel = *pc;
 #endif
         }
         m_label << *pc;