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

OS/2 update for wxUniv merge.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2001-07-06 21:45:11 +00:00
parent cf1dfa6b8f
commit 210a651b4f
25 changed files with 149 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
include/wx/os2/menu.h
View File

@@ -73,12 +73,6 @@ public:
}
#endif // wxUSE_MENU_CALLBACK
//
// OS2-specific
//
bool ProcessCommand(wxCommandEvent& rEvent);
//
// Implementation only from now on
// -------------------------------
@@ -101,12 +95,6 @@ public:
//
WXHMENU GetHMenu() const { return m_hMenu; }
//
// Attach/detach menu to/from wxMenuBar
//
void Attach(wxMenuBar* pMenubar);
void Detach(void);
#if wxUSE_ACCEL
//
// Called by wxMenuBar to build its accel table from the accels of all menus
@@ -166,7 +154,7 @@ private:
//
// The helper variable for creating unique IDs.
//
static USHORT m_nextMenuId;
static USHORT m_nextMenuId;
#if wxUSE_ACCEL
//
@@ -254,22 +242,8 @@ public:
// Implementation from now on
//
WXHMENU Create(void);
void Detach(void);
//
// Returns TRUE if we're attached to a frame
//
bool IsAttached(void) const { return m_pMenuBarFrame != NULL; }
//
// Get the frame we live in
//
wxFrame * GetFrame(void) const { return m_pMenuBarFrame; }
//
// Attach to a frame
//
void Attach(wxFrame* pFrame);
virtual void Detach(void);
virtual void Attach(wxFrame* pFrame);
#if wxUSE_ACCEL
//
@@ -305,7 +279,6 @@ protected:
wxArrayString m_titles;
wxFrame* m_pMenuBarFrame;
WXHMENU m_hMenu;
#if wxUSE_ACCEL
@@ -315,6 +288,8 @@ protected:
wxAcceleratorTable m_vAccelTable;
#endif // wxUSE_ACCEL
wxFrame* m_pMenuBarFrame;
private:
//
// Virtual function hiding suppression