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

Bitmap and menu updates

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15139 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-04-15 03:31:42 +00:00
parent 4ca24f185f
commit 598d8cacef
10 changed files with 131 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,11 +13,11 @@
#define _WX_MENU_H_
#if wxUSE_ACCEL
// #include "wx/accel.h"
// #include "wx/list.h" // for "template" list classes
// #include "wx/dynarray.h"
#include "wx/accel.h"
#include "wx/list.h" // for "template" list classes
#include "wx/dynarray.h"
// WX_DECLARE_EXPORTED_LIST(wxAcceleratorEntry, wxAcceleratorList);
WX_DEFINE_EXPORTED_ARRAY(wxAcceleratorEntry *, wxAcceleratorArray);
#endif // wxUSE_ACCEL
class WXDLLEXPORT wxFrame;
@@ -78,6 +78,8 @@ public:
// Implementation only from now on
// -------------------------------
//
virtual void Attach(wxMenuBarBase* pMenubar);
bool OS2Command( WXUINT uParam
,WXWORD wId
);
@@ -100,8 +102,8 @@ public:
//
// Called by wxMenuBar to build its accel table from the accels of all menus
//
bool HasAccels(void) const { return m_vAccels[0] != NULL; }
size_t GetAccelCount(void) const { return (size_t)m_nNextAccel; }
bool HasAccels(void) const { return m_vAccels.IsEmpty(); }
size_t GetAccelCount(void) const { return m_vAccels.GetCount(); }
size_t CopyAccels(wxAcceleratorEntry* pAccels) const;
//
@@ -160,7 +162,7 @@ private:
//
// The helper variable for creating unique IDs.
//
static USHORT m_nextMenuId;
static USHORT m_nextMenuId;
//
// The position of the first item in the current radio group or -1
@@ -171,8 +173,7 @@ private:
//
// The accelerators for our menu items
//
wxAcceleratorEntry* m_vAccels[128];
int m_nNextAccel;
wxAcceleratorArray m_vAccels;
#endif // wxUSE_ACCEL
DECLARE_DYNAMIC_CLASS(wxMenu)

12
include/wx/os2/menuitem.h
View File

@@ -49,7 +49,7 @@ public:
,int nId = wxID_SEPARATOR
,const wxString& rStrName = ""
,const wxString& rWxHelp = ""
,wxItemKind kind = wxITEM_NORMAL
,wxItemKind eKind = wxITEM_NORMAL
,wxMenu* pSubMenu = NULL
);
@@ -88,6 +88,9 @@ public:
//
int GetRealId(void) const;
//
// Mark item as belonging to the given radio group
//
void SetAsRadioGroupStart(void);
void SetRadioGroupStart(int nStart);
void SetRadioGroupEnd(int nEnd);
@@ -110,8 +113,13 @@ private:
{
int m_nStart;
int m_nEnd;
} m_vRadioGroup;
} m_vRadioGroup;
//
// Does this item start a radio group?
//
bool m_bIsRadioGroupStart;
DECLARE_DYNAMIC_CLASS(wxMenuItem)
}; // end of CLASS wxMenuItem

2
include/wx/os2/window.h
View File

@@ -405,7 +405,7 @@ public:
,int nY
,WXUINT uFlags
);
bool HandleChar( WXDWORD wParam
bool HandleChar( WXWPARAM wParam
,WXLPARAM lParam
,bool bIsASCII = FALSE
);