wxGTK's built-in dockable menu now give their

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

diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index fb7fd4d3af88ab1495cf85de0883c3c7ca456431..ce57fdf9a64d53689f0f00d5025c8b5b6da98007 100644 (file)
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -2,9 +2,8 @@
 // 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
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Vadim Zeitlin

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


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

+#include "gtk/gtkfeatures.h"
+

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


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

-  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 )
 {
 
 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::Command( wxCommandEvent &WXUNUSED(event) )
 {

-};
+}

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

-  for ( const char *pc = label; *pc != '\0'; pc++ ) {
-    if ( *pc == '&' ) {
-      pc++; // skip it
+    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 0 // it would be unused anyhow for now - kbd interface not done yet

-      if ( *pc != '&' )
-        m_chAccel = *pc;
+            if ( *pc != '&' ) m_chAccel = *pc;

 #endif
 #endif

+        }
+        m_label << *pc;

     }
     }

-
-    m_label = "";
-    m_label << *pc;
-  }
-};
+}

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

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