wxMenu ctor made compatible again

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

diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp
index c9064a34136a0f241194ea2420e5b55e2fa0654c..69e7a9a0b2313bed46d693d94b4dfb682d5e6f1c 100644 (file)
--- a/src/gtk1/control.cpp
+++ b/src/gtk1/control.cpp
@@ -13,6 +13,8 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

+#include "gtk/gtkfeatures.h"
+

 //-----------------------------------------------------------------------------
 // wxControl
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxControl
 //-----------------------------------------------------------------------------


@@ -21,7 +23,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxControl,wxWindow)
 
 wxControl::wxControl(void)
 {
 
 wxControl::wxControl(void)
 {

-  m_needParent = TRUE;
+    m_needParent = TRUE;

 }
 
 wxControl::wxControl( wxWindow *parent, wxWindowID id,
 }
 
 wxControl::wxControl( wxWindow *parent, wxWindowID id,


@@ -37,24 +39,23 @@ 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++ ) {
-    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 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
 #endif

+        }
+        m_label << *pc;

     }
     }

-
-    m_label << *pc;
-  }

 }
 
 wxString wxControl::GetLabel(void) const
 {
 }
 
 wxString wxControl::GetLabel(void) const
 {

-  return m_label;
+    return m_label;

 }
 
 
 }
 
 

-