projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Applied patch [ 1166587 ] [wxMSW] Removes all flicker from wxStaticBox
[wxWidgets.git]
/
include
/
wx
/
gtk
/
menuitem.h
diff --git
a/include/wx/gtk/menuitem.h
b/include/wx/gtk/menuitem.h
index ba846a4b9c43f1940541494c3f24458c21bff95d..790aa6184763255a44875305133099ee2de37862 100644
(file)
--- a/
include/wx/gtk/menuitem.h
+++ b/
include/wx/gtk/menuitem.h
@@
-4,16
+4,18
@@
// Author: Robert Roebling
// RCS-ID: $Id$
// Copyright: (c) 1998 Robert Roebling
// Author: Robert Roebling
// RCS-ID: $Id$
// Copyright: (c) 1998 Robert Roebling
-// Licence: wxWindows licen
s
e
+// Licence: wxWindows licen
c
e
///////////////////////////////////////////////////////////////////////////////
#ifndef __GTKMENUITEMH__
#define __GTKMENUITEMH__
///////////////////////////////////////////////////////////////////////////////
#ifndef __GTKMENUITEMH__
#define __GTKMENUITEMH__
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface
#endif
#pragma interface
#endif
+#include "wx/bitmap.h"
+
//-----------------------------------------------------------------------------
// wxMenuItem
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// wxMenuItem
//-----------------------------------------------------------------------------
@@
-25,16
+27,17
@@
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();
// implement base class virtuals
virtual void SetText( const wxString& str );
wxMenu *subMenu = (wxMenu *)NULL);
~wxMenuItem();
// 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 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;
@@
-43,18
+46,33
@@
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; }
+ // 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)
};