removed redundant code

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

diff --git a/include/wx/gtk1/menuitem.h b/include/wx/gtk1/menuitem.h
index 58b65fc25dfef2748b43c6172b1fa4cf5a817678..0fb1eed49dc453e4a7fd74b422d9d3a6fab04b05 100644 (file)
--- a/include/wx/gtk1/menuitem.h
+++ b/include/wx/gtk1/menuitem.h
@@ -14,6 +14,8 @@
 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

+#include "wx/bitmap.h"
+

 //-----------------------------------------------------------------------------
 // wxMenuItem
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxMenuItem
 //-----------------------------------------------------------------------------


@@ -25,7 +27,7 @@ public:
                int id = wxID_SEPARATOR,
                const wxString& text = wxEmptyString,
                const wxString& help = wxEmptyString,
                int id = wxID_SEPARATOR,
                const wxString& text = wxEmptyString,
                const wxString& help = wxEmptyString,

-               bool isCheckable = FALSE,
+               wxItemKind kind = wxITEM_NORMAL,

                wxMenu *subMenu = (wxMenu *)NULL);
     ~wxMenuItem();
 
                wxMenu *subMenu = (wxMenu *)NULL);
     ~wxMenuItem();
 


@@ -34,22 +36,43 @@ public:
     virtual void Enable( bool enable = TRUE );
     virtual void Check( bool check = TRUE );
     virtual bool IsChecked() const;
     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; }
+
+#if wxUSE_ACCEL
+    virtual wxAcceleratorEntry *GetAccel() const;
+#endif // wxUSE_ACCEL

 
     // implementation
     void SetMenuItem(GtkWidget *menuItem) { m_menuItem = menuItem; }
     GtkWidget *GetMenuItem() const { return m_menuItem; }
 
     // 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; }
 
     wxString GetFactoryPath() const;
 
     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:
 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;
     // 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_menuItem;  // GtkMenuItem

+    GtkWidget* m_labelWidget; // Label widget

 
     DECLARE_DYNAMIC_CLASS(wxMenuItem)
 };
 
     DECLARE_DYNAMIC_CLASS(wxMenuItem)
 };