Added #include wx/dcclient.h and wx/settings.h for Vadims new code under

[wxWidgets.git] / src / gtk1 / control.cpp

diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp
index ce57fdf9a64d53689f0f00d5025c8b5b6da98007..69e7a9a0b2313bed46d693d94b4dfb682d5e6f1c 100644 (file)
--- 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 )
 {
 
 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
        {
             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;
 #endif
         }
         m_label << *pc;