made some wxHtmlEntitiesParser's methods public -- turned out they are useful

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

diff --git a/include/wx/gtk/menuitem.h b/include/wx/gtk/menuitem.h
index 54d91d04f1b79ab38fe1f2672c48abc00a9875dc..2a10795fb91ac4c81ff3de531d31191a851a50ee 100644 (file)
--- a/include/wx/gtk/menuitem.h
+++ b/include/wx/gtk/menuitem.h
@@ -14,6 +14,8 @@
 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

+#include "wx/bitmap.h"
+

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


@@ -34,6 +36,8 @@ 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;
 
 #if wxUSE_ACCEL
     virtual wxAcceleratorEntry *GetAccel() const;


@@ -42,6 +46,8 @@ public:
     // 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; }


@@ -52,8 +58,10 @@ private:
     void DoSetText(const wxString& text);
 
     wxString  m_hotKey;
     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)
 };