X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..39329d2edd5f6948474369e898b74d836538cf49:/include/wx/gtk/menuitem.h?ds=sidebyside

diff --git a/include/wx/gtk/menuitem.h b/include/wx/gtk/menuitem.h
index 790aa61847..bc5c7a8fc3 100644
--- a/include/wx/gtk/menuitem.h
+++ b/include/wx/gtk/menuitem.h
@@ -7,12 +7,8 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTKMENUITEMH__
-#define __GTKMENUITEMH__
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
+#ifndef _WX_GTKMENUITEM_H_
+#define _WX_GTKMENUITEM_H_
 
 #include "wx/bitmap.h"
 
@@ -20,7 +16,7 @@
 // wxMenuItem
 //-----------------------------------------------------------------------------
 
-class wxMenuItem : public wxMenuItemBase
+class WXDLLIMPEXP_CORE wxMenuItem : public wxMenuItemBase
 {
 public:
     wxMenuItem(wxMenu *parentMenu = (wxMenu *)NULL,
@@ -29,12 +25,12 @@ 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 Enable( bool enable = TRUE );
-    virtual void Check( bool check = TRUE );
+    virtual void SetItemLabel( const wxString& str );
+    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 const wxBitmap& GetBitmap() const { return m_bitmap; }
@@ -46,19 +42,24 @@ public:
     // implementation
     void SetMenuItem(GtkWidget *menuItem) { m_menuItem = menuItem; }
     GtkWidget *GetMenuItem() const { return m_menuItem; }
-    GtkWidget *GetLabelWidget() const { return m_labelWidget; }
-    void SetLabelWidget(GtkWidget *labelWidget) { m_labelWidget = labelWidget; }
-    wxString GetFactoryPath() const;
 
-    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);
 
+    wxString GetGtkItemLabel() { return m_gtkText; }
+
+#if WXWIN_COMPATIBILITY_2_8
     // compatibility only, don't use in new code
+    wxDEPRECATED(
     wxMenuItem(wxMenu *parentMenu,
                int id,
                const wxString& text,
                const wxString& help,
                bool isCheckable,
-               wxMenu *subMenu = (wxMenu *)NULL);
+               wxMenu *subMenu = NULL)
+    );
+#endif
 
 private:
     // common part of all ctors
@@ -68,15 +69,13 @@ private:
     // 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
-    GtkWidget* m_labelWidget; // Label widget
 
     DECLARE_DYNAMIC_CLASS(wxMenuItem)
 };
 
-
-#endif
-        //__GTKMENUITEMH__
+#endif // _WX_GTKMENUITEM_H_