projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merged in fix for GetValue() from the 2.2 branch
[wxWidgets.git]
/
src
/
motif
/
menu.cpp
diff --git
a/src/motif/menu.cpp
b/src/motif/menu.cpp
index 4b69ef18e4f0472012dbfbe5dbc42afa9c75ed60..964bc73ac8988b2b6ccf102941b1c4519458c34d 100644
(file)
--- a/
src/motif/menu.cpp
+++ b/
src/motif/menu.cpp
@@
-32,6
+32,8
@@
#ifdef __VMS__
#pragma message disable nosimpint
#ifdef __VMS__
#pragma message disable nosimpint
+#define XtDisplay XTDISPLAY
+#define XtWindow XTWINDOW
#endif
#include <Xm/Label.h>
#include <Xm/LabelG.h>
#endif
#include <Xm/Label.h>
#include <Xm/LabelG.h>
@@
-51,10
+53,8
@@
// other standard headers
#include <string.h>
// other standard headers
#include <string.h>
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler)
IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler)
IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler)
IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler)
-#endif
// ============================================================================
// implementation
// ============================================================================
// implementation
@@
-363,7
+363,7
@@
bool wxMenuBar::CreateMenuBar(wxFrame* parent)
{
if (m_mainWidget)
{
{
if (m_mainWidget)
{
- XtVaSetValues((Widget) parent->GetMainWi
ndowWi
dget(), XmNmenuBar, (Widget) m_mainWidget, NULL);
+ XtVaSetValues((Widget) parent->GetMainWidget(), XmNmenuBar, (Widget) m_mainWidget, NULL);
/*
if (!XtIsManaged((Widget) m_mainWidget))
XtManageChild((Widget) m_mainWidget);
/*
if (!XtIsManaged((Widget) m_mainWidget))
XtManageChild((Widget) m_mainWidget);
@@
-372,7
+372,7
@@
bool wxMenuBar::CreateMenuBar(wxFrame* parent)
return TRUE;
}
return TRUE;
}
- Widget menuBarW = XmCreateMenuBar ((Widget) parent->GetMainWi
ndowWi
dget(), "MenuBar", NULL, 0);
+ Widget menuBarW = XmCreateMenuBar ((Widget) parent->GetMainWidget(), "MenuBar", NULL, 0);
m_mainWidget = (WXWidget) menuBarW;
size_t menuCount = GetMenuCount();
m_mainWidget = (WXWidget) menuBarW;
size_t menuCount = GetMenuCount();
@@
-403,7
+403,7
@@
bool wxMenuBar::CreateMenuBar(wxFrame* parent)
SetForegroundColour(m_foregroundColour);
SetFont(m_font);
SetForegroundColour(m_foregroundColour);
SetFont(m_font);
- XtVaSetValues((Widget) parent->GetMainWi
ndowWi
dget(), XmNmenuBar, (Widget) m_mainWidget, NULL);
+ XtVaSetValues((Widget) parent->GetMainWidget(), XmNmenuBar, (Widget) m_mainWidget, NULL);
XtRealizeWidget ((Widget) menuBarW);
XtManageChild ((Widget) menuBarW);
SetMenuBarFrame(parent);
XtRealizeWidget ((Widget) menuBarW);
XtManageChild ((Widget) menuBarW);
SetMenuBarFrame(parent);