Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. regenerated the makefiles to include menucmn.cpp

Browse Source 
2. more compilation fixes for DW changes
3. implemented dynamic menu support for wxMSW
4. added code to the toolbar sample to test it


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-10-26 23:38:33 +00:00
parent a8cfd0cbf1
commit ad9bb75ff2
12 changed files with 354 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/msw/menu.h
View File

@@ -128,7 +128,6 @@ public:
bool ProcessCommand(wxCommandEvent& event);
virtual void SetParent(wxEvtHandler *parent) { m_parent = parent; }
void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; }
wxEvtHandler *GetEventHandler() const { return m_eventHandler; }
@@ -182,7 +181,6 @@ private:
wxMenu * m_topLevelMenu;
wxMenuBar * m_menuBar;
wxList m_menuItems;
wxEvtHandler * m_parent;
wxEvtHandler * m_eventHandler;
wxWindow *m_pInvokingWindow;
void* m_clientData;
@@ -223,11 +221,6 @@ public:
virtual void SetLabelTop( size_t pos, const wxString& label );
virtual wxString GetLabelTop( size_t pos ) const;
// notifications: return FALSE to prevent the menu from being
// appended/deleted
virtual bool OnAppend(wxMenu *menu, const wxChar *title);
virtual bool OnDelete(wxMenu *menu, int index);
// compatibility: these functions are deprecated
#ifdef WXWIN_COMPATIBILITY
void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; }