projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DoGetBestSize fix, the lbWidth was not getting updated because of a
[wxWidgets.git]
/
src
/
x11
/
window.cpp
diff --git
a/src/x11/window.cpp
b/src/x11/window.cpp
index b106def7b6c6cf0eb53c6530288aef9f47379f37..9c5f6f49b87cf537af724f28cb18972ab28d51b5 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"
+ #include "wx/module.h"
#endif
#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 & Mod
1
Mask);
- ms.SetMetaDown(mask & Mod
2
Mask);
+ ms.SetAltDown(mask & Mod
3
Mask);
+ ms.SetMetaDown(mask & Mod
1
Mask);
return ms;
}
return ms;
}
@@
-1694,8
+1694,14
@@
int wxNoOptimize::ms_count = 0;
class wxWinModule : public wxModule
{
public:
class wxWinModule : public wxModule
{
public:
- bool OnInit();
- void OnExit();
+ wxWinModule()
+ {
+ // we must be cleaned up before the display is closed
+ AddDependency(wxClassInfo::FindClass(_T("wxX11DisplayModule")));
+ }
+
+ virtual bool OnInit();
+ virtual void OnExit();
private:
DECLARE_DYNAMIC_CLASS(wxWinModule)
private:
DECLARE_DYNAMIC_CLASS(wxWinModule)