projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get/SetTitle only for wxTopLevelWindow (wxMac part).
[wxWidgets.git]
/
include
/
wx
/
menu.h
diff --git
a/include/wx/menu.h
b/include/wx/menu.h
index ba9f52ea932cbe2233f3f31c7a16e336f6d8ab83..624e2669efacf1d250ec6deb69a34e19b32cbbd3 100644
(file)
--- a/
include/wx/menu.h
+++ b/
include/wx/menu.h
@@
-12,10
+12,6
@@
#ifndef _WX_MENU_H_BASE_
#define _WX_MENU_H_BASE_
#ifndef _WX_MENU_H_BASE_
#define _WX_MENU_H_BASE_
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma interface "menubase.h"
-#endif
-
#include "wx/defs.h"
#if wxUSE_MENUS
#include "wx/defs.h"
#if wxUSE_MENUS
@@
-450,6
+446,7
@@
public:
void Check(int itemid, bool check);
bool IsChecked(int itemid) const;
bool IsEnabled(int itemid) const;
void Check(int itemid, bool check);
bool IsChecked(int itemid) const;
bool IsEnabled(int itemid) const;
+ virtual bool IsEnabled() const { return wxWindow::IsEnabled(); }
void SetLabel(int itemid, const wxString &label);
wxString GetLabel(int itemid) const;
void SetLabel(int itemid, const wxString &label);
wxString GetLabel(int itemid) const;