X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9739d9ee8090965862ba623b09a8fba731dc3d5c..adac097759c089b3d47f48c7756ace4f0b8df879:/src/motif/menu.cpp diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp index 23b39e39ba..05c0912007 100644 --- a/src/motif/menu.cpp +++ b/src/motif/menu.cpp @@ -22,6 +22,8 @@ // headers // ---------------------------------------------------------------------------- +#include "wx/defs.h" + #include "wx/menu.h" #include "wx/menuitem.h" #include "wx/log.h" @@ -30,6 +32,11 @@ #include "wx/frame.h" #include "wx/settings.h" +#ifdef __VMS__ +#pragma message disable nosimpint +#define XtDisplay XTDISPLAY +#define XtWindow XTWINDOW +#endif #include #include #include @@ -39,16 +46,17 @@ #include #include #include +#ifdef __VMS__ +#pragma message enable nosimpint +#endif #include "wx/motif/private.h" // other standard headers #include -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler) IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler) -#endif // ============================================================================ // implementation @@ -278,7 +286,7 @@ bool wxMenuBar::Append(wxMenu * menu, const wxString& title) menu->SetButtonWidget(w); } - menu->SetMenuBar(this); + //menu->SetMenuBar(this); m_titles.Add(title); @@ -357,7 +365,7 @@ bool wxMenuBar::CreateMenuBar(wxFrame* parent) { if (m_mainWidget) { - XtVaSetValues((Widget) parent->GetMainWindowWidget(), XmNmenuBar, (Widget) m_mainWidget, NULL); + XtVaSetValues((Widget) parent->GetMainWidget(), XmNmenuBar, (Widget) m_mainWidget, NULL); /* if (!XtIsManaged((Widget) m_mainWidget)) XtManageChild((Widget) m_mainWidget); @@ -366,7 +374,7 @@ bool wxMenuBar::CreateMenuBar(wxFrame* parent) return TRUE; } - Widget menuBarW = XmCreateMenuBar ((Widget) parent->GetMainWindowWidget(), "MenuBar", NULL, 0); + Widget menuBarW = XmCreateMenuBar ((Widget) parent->GetMainWidget(), "MenuBar", NULL, 0); m_mainWidget = (WXWidget) menuBarW; size_t menuCount = GetMenuCount(); @@ -397,7 +405,7 @@ bool wxMenuBar::CreateMenuBar(wxFrame* parent) SetForegroundColour(m_foregroundColour); SetFont(m_font); - XtVaSetValues((Widget) parent->GetMainWindowWidget(), XmNmenuBar, (Widget) m_mainWidget, NULL); + XtVaSetValues((Widget) parent->GetMainWidget(), XmNmenuBar, (Widget) m_mainWidget, NULL); XtRealizeWidget ((Widget) menuBarW); XtManageChild ((Widget) menuBarW); SetMenuBarFrame(parent);