fixed typo in wxString::swap() which was completely broken

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

diff --git a/include/wx/gtk/menuitem.h b/include/wx/gtk/menuitem.h
index 6a2ed681ae88b2df30564953c3ef7176b558f66f..0fb1eed49dc453e4a7fd74b422d9d3a6fab04b05 100644 (file)
--- a/include/wx/gtk/menuitem.h
+++ b/include/wx/gtk/menuitem.h
@@ -27,7 +27,7 @@ public:
                int id = wxID_SEPARATOR,
                const wxString& text = wxEmptyString,
                const wxString& help = wxEmptyString,
-               wxItemKind kind = wxItem_Normal,
+               wxItemKind kind = wxITEM_NORMAL,
                wxMenu *subMenu = (wxMenu *)NULL);
     ~wxMenuItem();
 
@@ -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);