Added a const for CW compilation

[wxWidgets.git] / include / wx / gtk1 / control.h

diff --git a/include/wx/gtk1/control.h b/include/wx/gtk1/control.h
index 2a5227180e02ba15c2ddffc6f47d466e029a80bd..17db76e5711942fd57da856cd3aff3f6a2351fda 100644 (file)
--- a/include/wx/gtk1/control.h
+++ b/include/wx/gtk1/control.h
@@ -10,7 +10,7 @@
 #ifndef __GTKCONTROLH__
 #define __GTKCONTROLH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface
 #endif
 
@@ -29,8 +29,6 @@ class wxControl;
 // wxControl
 //-----------------------------------------------------------------------------
 
-extern const wxChar* wxControlNameStr;
-
 class wxControl : public wxControlBase
 {
 public:
@@ -38,24 +36,16 @@ public:
     wxControl(wxWindow *parent, wxWindowID id,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize, long style = 0,
-#if wxUSE_VALIDATORS
              const wxValidator& validator = wxDefaultValidator,
-#endif
              const wxString& name = wxControlNameStr)
     {
-        Create(parent, id, pos, size, style,
-#if wxUSE_VALIDATORS
-            validator, 
-#endif
-            name);
+        Create(parent, id, pos, size, style, validator, name);
     }
 
     bool Create(wxWindow *parent, wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize, long style = 0,
-#if wxUSE_VALIDATORS
             const wxValidator& validator = wxDefaultValidator,
-#endif
             const wxString& name = wxControlNameStr);
 
     // this function will filter out '&' characters and will put the accelerator
@@ -65,6 +55,9 @@ public:
 
 protected:
     virtual wxSize DoGetBestSize() const;
+#ifdef __WXGTK20__
+    wxString PrepareLabelMnemonics( const wxString &label ) const;
+#endif
 
     wxString   m_label;
     char       m_chAccel;  // enabled to avoid breaking binary compatibility later on