X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0cbc5287be2ff31581757553db319475ff6f515b..fea909e19e86b8da2d54c530d3a89ee9456c3333:/src/motif/window.cpp diff --git a/src/motif/window.cpp b/src/motif/window.cpp index 9da919ca55..720aff4a40 100644 --- a/src/motif/window.cpp +++ b/src/motif/window.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/motif/windows.cpp +// Name: src/motif/window.cpp // Purpose: wxWindow // Author: Julian Smart // Modified by: @@ -39,10 +39,10 @@ #include "wx/settings.h" #include "wx/scrolwin.h" #include "wx/layout.h" + #include "wx/menuitem.h" + #include "wx/module.h" #endif -#include "wx/module.h" -#include "wx/menuitem.h" #include "wx/evtloop.h" #if wxUSE_DRAG_AND_DROP @@ -65,7 +65,7 @@ // 2) call DoMoveWindow from DoSetSize, allowing controls to override it #ifdef __VMS__ -#pragma message disable nosimpint + #pragma message disable nosimpint #endif #include @@ -76,7 +76,7 @@ #include #include // for XmMenuPosition #ifdef __VMS__ -#pragma message enable nosimpint + #pragma message enable nosimpint #endif #include "wx/motif/private.h" @@ -2567,8 +2567,8 @@ wxMouseState wxGetMouseState() ms.SetControlDown(mask & ControlMask); ms.SetShiftDown(mask & ShiftMask); - ms.SetAltDown(mask & Mod1Mask); - ms.SetMetaDown(mask & Mod2Mask); + ms.SetAltDown(mask & Mod3Mask); + ms.SetMetaDown(mask & Mod1Mask); return ms; }