Don't emit bogus size events if a child window

[wxWidgets.git] / src / x11 / window.cpp

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index b106def7b6c6cf0eb53c6530288aef9f47379f37..7c5cc615f21c2869ffb4623a8459a3769ec73b1d 100644 (file)
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -45,10 +45,10 @@
     #include "wx/listbox.h"
     #include "wx/scrolwin.h"
     #include "wx/layout.h"
     #include "wx/listbox.h"
     #include "wx/scrolwin.h"
     #include "wx/layout.h"

+    #include "wx/menuitem.h"

 #endif
 
 #include "wx/module.h"
 #endif
 
 #include "wx/module.h"

-#include "wx/menuitem.h"

 #include "wx/fontutil.h"
 #include "wx/univ/renderer.h"
 
 #include "wx/fontutil.h"
 #include "wx/univ/renderer.h"
 


@@ -1673,8 +1673,8 @@ wxMouseState wxGetMouseState()
 
     ms.SetControlDown(mask & ControlMask);
     ms.SetShiftDown(mask & ShiftMask);
 
     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;
 }
 
     return ms;
 }