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
/
cocoa
/
menu.h
diff --git
a/include/wx/cocoa/menu.h
b/include/wx/cocoa/menu.h
index 965008536e729fc6c804d69360b0cf69e4448b44..479afe083b396222f1e104285ddb49b1da41d2b5 100644
(file)
--- a/
include/wx/cocoa/menu.h
+++ b/
include/wx/cocoa/menu.h
@@
-73,12
+73,12
@@
private:
// ========================================================================
// wxMenuBar
// ========================================================================
// ========================================================================
// wxMenuBar
// ========================================================================
-class WXDLLEXPORT wxMenuBar : public wxMenuBarBase
, public wxCocoaNSMenu
+class WXDLLEXPORT wxMenuBar : public wxMenuBarBase
{
public:
// ctors and dtor
wxMenuBar(long style = 0) { Create(style); }
{
public:
// ctors and dtor
wxMenuBar(long style = 0) { Create(style); }
- wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0)
+ wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0)
;
bool Create(long style = 0);
virtual ~wxMenuBar();
bool Create(long style = 0);
virtual ~wxMenuBar();