projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
readded wxEditableListBox as part of adv library
[wxWidgets.git]
/
include
/
wx
/
gtk1
/
menuitem.h
diff --git
a/include/wx/gtk1/menuitem.h
b/include/wx/gtk1/menuitem.h
index f166d2e96efd42b832a681a93dfd94cf08cad8d4..565cb5620d55f2fbd192b4643b5988461ee96245 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: wxWi
dget
s licence
+// Licence: wxWi
ndow
s licence
///////////////////////////////////////////////////////////////////////////////
#ifndef __GTKMENUITEMH__
#define __GTKMENUITEMH__
///////////////////////////////////////////////////////////////////////////////
#ifndef __GTKMENUITEMH__
#define __GTKMENUITEMH__
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#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,7
+25,7
@@
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
virtual void SetText( const wxString& str );
// implement base class virtuals
virtual void SetText( const wxString& str );
@@
-62,7
+58,7
@@
public:
private:
// common part of all ctors
private:
// common part of all ctors
- void Init(
const wxString& text
);
+ void Init();
// DoSetText() transforms the accel mnemonics in our label from MSW/wxWin
// style to GTK+ and is called from ctor and SetText()
// DoSetText() transforms the accel mnemonics in our label from MSW/wxWin
// style to GTK+ and is called from ctor and SetText()