X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..ef44a62179cde47dffb369b9731b2f74d54de52f:/src/gtk1/control.cpp

diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp
index 510d88d0e9..c9064a3413 100644
--- a/src/gtk1/control.cpp
+++ b/src/gtk1/control.cpp
@@ -2,10 +2,9 @@
 // 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__
@@ -22,30 +21,40 @@ IMPLEMENT_DYNAMIC_CLASS(wxControl,wxWindow)
 
 wxControl::wxControl(void)
 {
-  m_label = "";
   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 )
 {
-};
+}
 
 void wxControl::Command( wxCommandEvent &WXUNUSED(event) )
 {
-};
+}
 
 void wxControl::SetLabel( const wxString &label )
 {
-  m_label = label;
-};
+  m_label = "";
+  for ( const char *pc = label; *pc != '\0'; pc++ ) {
+    if ( *pc == '&' ) {
+      pc++; // skip it
+#if 0 // it would be unused anyhow for now - kbd interface not done yet
+      if ( *pc != '&' )
+        m_chAccel = *pc;
+#endif
+    }
+
+    m_label << *pc;
+  }
+}
 
 wxString wxControl::GetLabel(void) const
 {
   return m_label;
-};
+}