Reverted the _n__ fix for now.

[wxWidgets.git] / include / wx / gtk / menuitem.h

diff --git a/include/wx/gtk/menuitem.h b/include/wx/gtk/menuitem.h
index 54ea397bd126065fdd02b445755fee8c0e60de16..e83967053913a8f593b99b158babab2f65effe89 100644 (file)
--- a/include/wx/gtk/menuitem.h
+++ b/include/wx/gtk/menuitem.h
@@ -10,7 +10,7 @@
 #ifndef __GTKMENUITEMH__
 #define __GTKMENUITEMH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface
 #endif
 
@@ -52,7 +52,18 @@ public:
 
     wxString GetHotKey() const { return m_hotKey; }
 
+    // compatibility only, don't use in new code
+    wxMenuItem(wxMenu *parentMenu,
+               int id,
+               const wxString& text,
+               const wxString& help,
+               bool isCheckable,
+               wxMenu *subMenu = (wxMenu *)NULL);
+
 private:
+    // common part of all ctors
+    void Init(const wxString& text);
+
     // DoSetText() transforms the accel mnemonics in our label from MSW/wxWin
     // style to GTK+ and is called from ctor and SetText()
     void DoSetText(const wxString& text);