porting reordering of controls back from 2.8

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

diff --git a/include/wx/gtk/menuitem.h b/include/wx/gtk/menuitem.h
index ce936fa4ac3f7fac2550f7519d5c97592ad8b630..4133cc5e834f7804e7fb55940c0fa729fe613837 100644 (file)
--- a/include/wx/gtk/menuitem.h
+++ b/include/wx/gtk/menuitem.h
@@ -4,23 +4,19 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKMENUITEMH__
 #define __GTKMENUITEMH__
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "wx/bitmap.h"
 
 //-----------------------------------------------------------------------------
 // wxMenuItem
 //-----------------------------------------------------------------------------
 
-class wxMenuItem : public wxMenuItemBase
+class WXDLLIMPEXP_CORE wxMenuItem : public wxMenuItemBase
 {
 public:
     wxMenuItem(wxMenu *parentMenu = (wxMenu *)NULL,
@@ -29,10 +25,11 @@ public:
                const wxString& help = wxEmptyString,
                wxItemKind kind = wxITEM_NORMAL,
                wxMenu *subMenu = (wxMenu *)NULL);
-    ~wxMenuItem();
+    virtual ~wxMenuItem();
 
     // implement base class virtuals
-    virtual void SetText( const wxString& str );
+    virtual void SetItemLabel( const wxString& str );
+    virtual wxString GetItemLabel() const;
     virtual void Enable( bool enable = TRUE );
     virtual void Check( bool check = TRUE );
     virtual bool IsChecked() const;
@@ -52,6 +49,10 @@ public:
 
     wxString GetHotKey() const { return m_hotKey; }
 
+    // splits given string in the label, doing & => _ translation, which is returned,
+    // and in the hotkey which is used to set given pointer
+    static wxString GTKProcessMenuItemLabel(const wxString& str, wxString *hotKey);
+
     // compatibility only, don't use in new code
     wxMenuItem(wxMenu *parentMenu,
                int id,
@@ -62,7 +63,7 @@ public:
 
 private:
     // common part of all ctors
-    void Init();
+    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()
@@ -77,6 +78,5 @@ private:
     DECLARE_DYNAMIC_CLASS(wxMenuItem)
 };
 
-
 #endif
         //__GTKMENUITEMH__