projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bug with incorrect & test fixed
[wxWidgets.git]
/
src
/
motif
/
menuitem.cpp
diff --git
a/src/motif/menuitem.cpp
b/src/motif/menuitem.cpp
index 53de7f53821da81641bf561782eb2618fc83be56..deaad78a6fc565fdc6e90d9b7e93cbdd3593e85f 100644
(file)
--- a/
src/motif/menuitem.cpp
+++ b/
src/motif/menuitem.cpp
@@
-26,6
+26,9
@@
#include "wx/utils.h"
#include "wx/frame.h"
#include "wx/utils.h"
#include "wx/frame.h"
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
#include <Xm/Label.h>
#include <Xm/LabelG.h>
#include <Xm/CascadeBG.h>
#include <Xm/Label.h>
#include <Xm/LabelG.h>
#include <Xm/CascadeBG.h>
@@
-35,6
+38,9
@@
#include <Xm/ToggleB.h>
#include <Xm/ToggleBG.h>
#include <Xm/RowColumn.h>
#include <Xm/ToggleB.h>
#include <Xm/ToggleBG.h>
#include <Xm/RowColumn.h>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
#include "wx/motif/private.h"
#include "wx/motif/private.h"
@@
-54,9
+60,7
@@
static void wxMenuItemDisarmCallback(Widget w, XtPointer clientData, XtPointer p
// dynamic classes implementation
// ----------------------------------------------------------------------------
// dynamic classes implementation
// ----------------------------------------------------------------------------
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
-#endif //USE_SHARED_LIBRARY
// ----------------------------------------------------------------------------
// wxMenuItem
// ----------------------------------------------------------------------------
// wxMenuItem
@@
-109,7
+113,7
@@
void wxMenuItem::DeleteSubMenu()
void wxMenuItem::Enable(bool bDoEnable)
{
void wxMenuItem::Enable(bool bDoEnable)
{
- if ( m_is
Check
ed != bDoEnable )
+ if ( m_is
Enabl
ed != bDoEnable )
{
if ( !IsSubMenu() )
{
{
if ( !IsSubMenu() )
{