projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
just a change in comment for wxUSE_MS_HTML_HELP
[wxWidgets.git]
/
include
/
wx
/
os2
/
menuitem.h
diff --git
a/include/wx/os2/menuitem.h
b/include/wx/os2/menuitem.h
index 019584dee5decf5196f591f201b5c5356c6bee97..1e9d1d89b8bbc1fe2ecb1a8317ad5fb59cc24583 100644
(file)
--- a/
include/wx/os2/menuitem.h
+++ b/
include/wx/os2/menuitem.h
@@
-1,5
+1,5
@@
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
-// Name: menuitem.h
+// Name:
wx/os2/
menuitem.h
// Purpose: wxMenuItem class
// Author: Vadim Zeitlin
// Modified by:
// Purpose: wxMenuItem class
// Author: Vadim Zeitlin
// Modified by:
@@
-12,15
+12,11
@@
#ifndef _MENUITEM_H
#define _MENUITEM_H
#ifndef _MENUITEM_H
#define _MENUITEM_H
-#ifdef __GNUG__
-#pragma interface "menuitem.h"
-#endif
-
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#include "wx/
setup
.h"
+#include "wx/
defs
.h"
// an exception to the general rule that a normal header doesn't include other
// headers - only because ownerdrw.h is not always included and I don't want
// an exception to the general rule that a normal header doesn't include other
// headers - only because ownerdrw.h is not always included and I don't want
@@
-47,8
+43,8
@@
public:
//
wxMenuItem( wxMenu* pParentMenu = NULL
,int nId = wxID_SEPARATOR
//
wxMenuItem( wxMenu* pParentMenu = NULL
,int nId = wxID_SEPARATOR
- ,const wxString& rStrName =
""
- ,const wxString& rWxHelp =
""
+ ,const wxString& rStrName =
wxEmptyString
+ ,const wxString& rWxHelp =
wxEmptyString
,wxItemKind eKind = wxITEM_NORMAL
,wxMenu* pSubMenu = NULL
);
,wxItemKind eKind = wxITEM_NORMAL
,wxMenu* pSubMenu = NULL
);
@@
-71,8
+67,8
@@
public:
virtual void SetText(const wxString& rStrName);
virtual void SetCheckable(bool bCheckable);
virtual void SetText(const wxString& rStrName);
virtual void SetCheckable(bool bCheckable);
- virtual void Enable(bool bDoEnable =
TRUE
);
- virtual void Check(bool bDoCheck =
TRUE
);
+ virtual void Enable(bool bDoEnable =
true
);
+ virtual void Check(bool bDoCheck =
true
);
virtual bool IsChecked(void) const;
//
virtual bool IsChecked(void) const;
//