projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
document various enumerations defined in defs.h; give a name to the anonymous enum...
[wxWidgets.git]
/
include
/
wx
/
os2
/
menu.h
diff --git
a/include/wx/os2/menu.h
b/include/wx/os2/menu.h
index 35c3b9016c97a538d11739f4aef4fd192c337d6a..95ad8e33c9793133718c096d6d69648a7d8b8a5c 100644
(file)
--- a/
include/wx/os2/menu.h
+++ b/
include/wx/os2/menu.h
@@
-17,10
+17,10
@@
#include "wx/list.h" // for "template" list classes
#include "wx/dynarray.h"
#include "wx/list.h" // for "template" list classes
#include "wx/dynarray.h"
- WX_DEFINE_EXPORTED_ARRAY(wxAcceleratorEntry *, wxAcceleratorArray);
+ WX_DEFINE_EXPORTED_ARRAY
_PTR
(wxAcceleratorEntry *, wxAcceleratorArray);
#endif // wxUSE_ACCEL
#endif // wxUSE_ACCEL
-class WXDLL
EXPORT
wxFrame;
+class WXDLL
IMPEXP_FWD_CORE
wxFrame;
void wxSetShortCutKey(wxChar* zText);
void wxSetShortCutKey(wxChar* zText);
@@
-28,7
+28,7
@@
void wxSetShortCutKey(wxChar* zText);
// Menu
// ----------------------------------------------------------------------------
// Menu
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxMenu : public wxMenuBase
+class WXDLL
IMPEXP_CORE
wxMenu : public wxMenuBase
{
public:
//
{
public:
//
@@
-139,9
+139,9
@@
private:
void EndRadioGroup(void);
//
void EndRadioGroup(void);
//
- // If
TRUE
, insert a breal before appending the next item
+ // If
true
, insert a breal before appending the next item
//
//
- bool
m_bDoBreak;
+ bool m_bDoBreak;
//
// The menu handle of this menu
//
// The menu handle of this menu
@@
-172,7
+172,7
@@
private:
// Menu Bar (a la Windows)
// ----------------------------------------------------------------------------
// Menu Bar (a la Windows)
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxMenuBar : public wxMenuBarBase
+class WXDLL
IMPEXP_CORE
wxMenuBar : public wxMenuBarBase
{
public:
//
{
public:
//
@@
-226,10
+226,10
@@
public:
virtual void EnableTop( size_t nPos
,bool bFlag
);
virtual void EnableTop( size_t nPos
,bool bFlag
);
- virtual void Set
LabelTop
( size_t nPos
+ virtual void Set
MenuLabel
( size_t nPos
,const wxString& rLabel
);
,const wxString& rLabel
);
- virtual wxString Get
LabelTop
(size_t nPos) const;
+ virtual wxString Get
MenuLabel
(size_t nPos) const;
//
// Implementation from now on
//
// Implementation from now on