//... => /* ... */

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

diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index 4b04d0bb37627694bda679c1dee9c49c3ff549b3..578b12cb9fcdd8f3e7bceea2f76549ffd14934e6 100644 (file)
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -13,38 +13,39 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

+#include "gtk/gtkfeatures.h"
+

 //-----------------------------------------------------------------------------
 // wxControl
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxControl,wxWindow)
 
 //-----------------------------------------------------------------------------
 // wxControl
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxControl,wxWindow)
 

-wxControl::wxControl(void)
+wxControl::wxControl()

 {
     m_needParent = TRUE;
 }
 
 {
     m_needParent = TRUE;
 }
 

-wxControl::wxControl( wxWindow *parent, wxWindowID id,
-      const wxPoint &pos, const wxSize &size,
-      long style, const wxString &name ) :
-  wxWindow( parent, id, pos, size, style, name )
-{
-}
-
-void wxControl::Command( wxCommandEvent &WXUNUSED(event) )
+wxControl::wxControl( wxWindow *parent,
+                      wxWindowID id,
+                      const wxPoint &pos,
+                      const wxSize &size,
+                      long style,
+                      const wxString &name )
+         : wxWindow( parent, id, pos, size, style, name )

 {
 }
 
 void wxControl::SetLabel( const wxString &label )
 {
 {
 }
 
 void wxControl::SetLabel( const wxString &label )
 {

-    m_label = "";
-    for ( const char *pc = label; *pc != '\0'; pc++ ) 
+    m_label.Empty();
+    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;