compilation fix

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

diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index 510d88d0e936c9e3b4b7c3eca200ca6289cbc4a9..69e7a9a0b2313bed46d693d94b4dfb682d5e6f1c 100644 (file)
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -2,10 +2,9 @@
 // Name:        control.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        control.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Vadim Zeitlin
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -14,6 +13,8 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

+#include "gtk/gtkfeatures.h"
+

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


@@ -22,30 +23,39 @@ IMPLEMENT_DYNAMIC_CLASS(wxControl,wxWindow)
 
 wxControl::wxControl(void)
 {
 
 wxControl::wxControl(void)
 {

-  m_label = "";
-  m_needParent = TRUE;
-};
+    m_needParent = TRUE;
+}

 
 

-wxControl::wxControl( wxWindow *parent, wxWindowID id, 
-      const wxPoint &pos, const wxSize &size, 
-      const long style, const wxString &name ) :
+wxControl::wxControl( wxWindow *parent, wxWindowID id,
+      const wxPoint &pos, const wxSize &size,
+      long style, const wxString &name ) :

   wxWindow( parent, id, pos, size, style, name )
 {
   wxWindow( parent, id, pos, size, style, name )
 {

-};
+}

 
 void wxControl::Command( wxCommandEvent &WXUNUSED(event) )
 {
 
 void wxControl::Command( wxCommandEvent &WXUNUSED(event) )
 {

-};
+}

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

-  m_label = label;
-};
+    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 != _T('&') ) m_chAccel = *pc;
+#endif
+        }
+        m_label << *pc;
+    }
+}

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

-  return m_label;
-};
-
+    return m_label;
+}