Patch #826420, and also adapted to new SWIG

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

diff --git a/include/wx/gtk1/control.h b/include/wx/gtk1/control.h
index 085e5e8cfc3624e60741fa04aabc344dd00d1d00..623133c461bf6fc3d2efb546885c2ec6476041ec 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(NO_GCC_PRAGMA)
 #pragma interface
 #endif
 
@@ -29,8 +29,6 @@ class wxControl;
 // wxControl
 //-----------------------------------------------------------------------------
 
-extern const wxChar* wxControlNameStr;
-
 class wxControl : public wxControlBase
 {
 public:
@@ -57,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