X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6de7047076f388adc95b2eb5c95d5860d65f2f7d..ccec90930cfc38bd4347a97f46481242d9fd23cd:/src/motif/window.cpp?ds=sidebyside

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index 2d8b65b31b..c539b36fba 100644
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -35,6 +35,7 @@
     #include "wx/layout.h"
     #include "wx/menuitem.h"
     #include "wx/module.h"
+    #include "wx/unix/utilsx11.h"
 #endif
 
 #include "wx/evtloop.h"
@@ -1083,7 +1084,6 @@ bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
 
     menu->SetId(1); /* Mark as popped-up */
     menu->CreateMenu(NULL, widget, menu, 0);
-    menu->SetInvokingWindow(this);
 
     menu->UpdateUI();
 
@@ -2098,7 +2098,7 @@ static void wxScrollBarCallback(Widget scrollbar,
                                 XmScrollBarCallbackStruct *cbs)
 {
     wxWindow *win = wxGetWindowFromTable(scrollbar);
-    wxCHECK_RET( win, _T("invalid widget in scrollbar callback") );
+    wxCHECK_RET( win, wxT("invalid widget in scrollbar callback") );
 
     wxOrientation orientation = (wxOrientation)wxPtrToUInt(clientData);