X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6de97a3b945c99fb942209df48be26f43c1b436d..d872b8a92690eb3332510627d8064bf41a8c5534:/src/gtk/control.cpp

diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index 61bab59ecf..69e7a9a0b2 100644
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -2,9 +2,8 @@
 // Name:        control.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -14,6 +13,8 @@
 
 #include "wx/control.h"
 
+#include "gtk/gtkfeatures.h"
+
 //-----------------------------------------------------------------------------
 // wxControl
 //-----------------------------------------------------------------------------
@@ -22,7 +23,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxControl,wxWindow)
 
 wxControl::wxControl(void)
 {
-  m_needParent = TRUE;
+    m_needParent = TRUE;
 }
 
 wxControl::wxControl( wxWindow *parent, wxWindowID id,
@@ -38,24 +39,23 @@ void wxControl::Command( wxCommandEvent &WXUNUSED(event) )
 
 void wxControl::SetLabel( const wxString &label )
 {
-  m_label = "";
-  for ( const char *pc = label; *pc != '\0'; pc++ ) {
-    if ( *pc == '&' ) {
-      pc++; // skip it
+    m_label = _T("");
+    for ( const wxChar *pc = label; *pc != _T('\0'); 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;
     }
-
-    m_label << *pc;
-  }
 }
 
 wxString wxControl::GetLabel(void) const
 {
-  return m_label;
+    return m_label;
 }
 
 
-