wxHtmlEasyPrinting indentation changes + CreatePrintout,DoPrint and DoPreview virtual...

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

diff --git a/include/wx/gtk1/menuitem.h b/include/wx/gtk1/menuitem.h
index ba846a4b9c43f1940541494c3f24458c21bff95d..2a10795fb91ac4c81ff3de531d31191a851a50ee 100644 (file)
--- a/include/wx/gtk1/menuitem.h
+++ b/include/wx/gtk1/menuitem.h
@@ -14,6 +14,8 @@
 #pragma interface
 #endif
 
+#include "wx/bitmap.h"
+
 //-----------------------------------------------------------------------------
 // wxMenuItem
 //-----------------------------------------------------------------------------
@@ -31,10 +33,11 @@ public:
 
     // implement base class virtuals
     virtual void SetText( const wxString& str );
-    virtual wxString GetLabel() 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;
@@ -43,6 +46,8 @@ 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; }
@@ -53,8 +58,10 @@ private:
     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)
 };