projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
the wxFormatString hack used in wxFileTypeInfo variadic ctors doesn't work anymore...
[wxWidgets.git]
/
include
/
wx
/
gtk1
/
menuitem.h
diff --git
a/include/wx/gtk1/menuitem.h
b/include/wx/gtk1/menuitem.h
index 54ea397bd126065fdd02b445755fee8c0e60de16..827cf6e780195e9ba66677f5d1afba51bbe92d78 100644
(file)
--- a/
include/wx/gtk1/menuitem.h
+++ b/
include/wx/gtk1/menuitem.h
@@
-1,26
+1,22
@@
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
-// Name: menuitem.h
+// Name:
wx/gtk1/
menuitem.h
// Purpose: wxMenuItem class
// Author: Robert Roebling
// RCS-ID: $Id$
// Copyright: (c) 1998 Robert Roebling
// Purpose: wxMenuItem class
// 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__
-#ifdef __GNUG__
-#pragma interface
-#endif
-
#include "wx/bitmap.h"
//-----------------------------------------------------------------------------
// wxMenuItem
//-----------------------------------------------------------------------------
#include "wx/bitmap.h"
//-----------------------------------------------------------------------------
// wxMenuItem
//-----------------------------------------------------------------------------
-class wxMenuItem : public wxMenuItemBase
+class
WXDLLIMPEXP_CORE
wxMenuItem : public wxMenuItemBase
{
public:
wxMenuItem(wxMenu *parentMenu = (wxMenu *)NULL,
{
public:
wxMenuItem(wxMenu *parentMenu = (wxMenu *)NULL,
@@
-29,10
+25,11
@@
public:
const wxString& help = wxEmptyString,
wxItemKind kind = wxITEM_NORMAL,
wxMenu *subMenu = (wxMenu *)NULL);
const wxString& help = wxEmptyString,
wxItemKind kind = wxITEM_NORMAL,
wxMenu *subMenu = (wxMenu *)NULL);
- ~wxMenuItem();
+
virtual
~wxMenuItem();
// implement base class virtuals
// implement base class virtuals
- virtual void SetText( const wxString& str );
+ virtual void SetItemLabel( const wxString& str );
+ virtual wxString GetItemLabel() 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;
@@
-52,7
+49,18
@@
public:
wxString GetHotKey() const { return m_hotKey; }
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();
+
// 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);
// 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);
@@
-66,6
+74,5
@@
private:
DECLARE_DYNAMIC_CLASS(wxMenuItem)
};
DECLARE_DYNAMIC_CLASS(wxMenuItem)
};
-
#endif
//__GTKMENUITEMH__
#endif
//__GTKMENUITEMH__