X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c4f8f8d180afa03110f52eb95f9b083088f5c03..adac097759c089b3d47f48c7756ace4f0b8df879:/src/motif/menu.cpp?ds=sidebyside diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp index 192264a201..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" @@ -32,6 +34,8 @@ #ifdef __VMS__ #pragma message disable nosimpint +#define XtDisplay XTDISPLAY +#define XtWindow XTWINDOW #endif #include #include @@ -51,10 +55,8 @@ // other standard headers #include -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler) IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler) -#endif // ============================================================================ // implementation @@ -284,7 +286,7 @@ bool wxMenuBar::Append(wxMenu * menu, const wxString& title) menu->SetButtonWidget(w); } - menu->SetMenuBar(this); + //menu->SetMenuBar(this); m_titles.Add(title);