X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debe6624c1e9d4bf3243381153d1e173c849bcd8..8736a9a0d3edd5dec7cf179c3ea74249e7b6182d:/src/gtk/control.cpp

diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index 237f37d89f..69e7a9a0b2 100644
--- a/src/gtk/control.cpp
+++ b/src/gtk/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__
@@ -14,6 +13,8 @@
 
 #include "wx/control.h"
 
+#include "gtk/gtkfeatures.h"
+
 //-----------------------------------------------------------------------------
 // wxControl
 //-----------------------------------------------------------------------------
@@ -22,30 +23,39 @@ IMPLEMENT_DYNAMIC_CLASS(wxControl,wxWindow)
 
 wxControl::wxControl(void)
 {
-  m_label = "";
-  m_needParent = TRUE;
-};
+    m_needParent = TRUE;
+}
 
-wxControl::wxControl( wxWindow *parent, wxWindowID id, 
-      const wxPoint &pos, const wxSize &size, 
+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 = _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
 {
-  return m_label;
-};
-
+    return m_label;
+}