Updated event type declarations to follow what other sub-libraries do these days...

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

diff --git a/include/wx/gtk/menuitem.h b/include/wx/gtk/menuitem.h
index 4133cc5e834f7804e7fb55940c0fa729fe613837..fc60a7d3e6dd4bce95e2c4d4438b7edd1923d99c 100644 (file)
--- a/include/wx/gtk/menuitem.h
+++ b/include/wx/gtk/menuitem.h
@@ -7,8 +7,8 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTKMENUITEMH__
-#define __GTKMENUITEMH__
+#ifndef _WX_GTKMENUITEM_H_
+#define _WX_GTKMENUITEM_H_
 
 #include "wx/bitmap.h"
 
@@ -29,54 +29,35 @@ public:
 
     // implement base class virtuals
     virtual void SetItemLabel( const wxString& str );
-    virtual wxString GetItemLabel() const;
-    virtual void Enable( bool enable = TRUE );
-    virtual void Check( bool check = TRUE );
+    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; }
-    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);
+    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,
                const wxString& help,
                bool isCheckable,
-               wxMenu *subMenu = (wxMenu *)NULL);
+               wxMenu *subMenu = NULL)
+    );
+#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_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_