X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/92159e3d769551d78d8f48f438fc8c40655d23d2..49a63afbad7646668df343d29edd88458bc7e0a9:/include/wx/gtk/menuitem.h?ds=inline

diff --git a/include/wx/gtk/menuitem.h b/include/wx/gtk/menuitem.h
index bc5c7a8fc3..7f509584b0 100644
--- a/include/wx/gtk/menuitem.h
+++ b/include/wx/gtk/menuitem.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        menuitem.h
+// Name:        wx/gtk/menuitem.h
 // Purpose:     wxMenuItem class
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
@@ -19,12 +19,12 @@
 class WXDLLIMPEXP_CORE wxMenuItem : public wxMenuItemBase
 {
 public:
-    wxMenuItem(wxMenu *parentMenu = (wxMenu *)NULL,
+    wxMenuItem(wxMenu *parentMenu = NULL,
                int id = wxID_SEPARATOR,
                const wxString& text = wxEmptyString,
                const wxString& help = wxEmptyString,
                wxItemKind kind = wxITEM_NORMAL,
-               wxMenu *subMenu = (wxMenu *)NULL);
+               wxMenu *subMenu = NULL);
     virtual ~wxMenuItem();
 
     // implement base class virtuals
@@ -32,26 +32,18 @@ public:
     virtual void Enable( bool enable = true );
     virtual void Check( bool check = true );
     virtual bool IsChecked() const;
-    virtual void SetBitmap(const wxBitmap& bitmap) { m_bitmap = bitmap; }
+    virtual void SetBitmap(const wxBitmap& bitmap);
     virtual const wxBitmap& GetBitmap() const { return m_bitmap; }
 
-#if wxUSE_ACCEL
-    virtual wxAcceleratorEntry *GetAccel() const;
-#endif // wxUSE_ACCEL
-
     // implementation
     void SetMenuItem(GtkWidget *menuItem) { m_menuItem = menuItem; }
     GtkWidget *GetMenuItem() const { return m_menuItem; }
-
-    // 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);
-
-    wxString GetGtkItemLabel() { return m_gtkText; }
+    void SetGtkLabel();
 
 #if WXWIN_COMPATIBILITY_2_8
     // compatibility only, don't use in new code
     wxDEPRECATED(
+    inline
     wxMenuItem(wxMenu *parentMenu,
                int id,
                const wxString& text,
@@ -62,17 +54,7 @@ public:
 #endif
 
 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);
-
-    wxString  m_gtkText; // m_text after conversion to GTK mnemonics
-    wxString  m_hotKey;
     wxBitmap  m_bitmap; // Bitmap for menuitem, if any
-
     GtkWidget *m_menuItem;  // GtkMenuItem
 
     DECLARE_DYNAMIC_CLASS(wxMenuItem)