Changed wxGridCellEditor::IsAcceptedKey to only check Control and Alt,

[wxWidgets.git] / src / qt / threadno.cpp

diff --git a/src/qt/threadno.cpp b/src/qt/threadno.cpp
index b0db0f426af8383fe938e16e7bb24d4fa9dfef22..8cf94d1e0621c9eff0e419cceb89e79370c35e18 100644 (file)
--- a/src/qt/threadno.cpp
+++ b/src/qt/threadno.cpp
@@ -143,7 +143,7 @@ bool wxThread::IsAlive() const
 void wxThread::SetPriority(int WXUNUSED(prio)) { }
 int wxThread::GetPriority() const { return 0; }
 
 void wxThread::SetPriority(int WXUNUSED(prio)) { }
 int wxThread::GetPriority() const { return 0; }
 

-wxMutex wxMainMutex; // controls access to all GUI functions
+wxMutex *wxMainMutex; // controls access to all GUI functions

 
 wxThread::wxThread()
 {
 
 wxThread::wxThread()
 {


@@ -173,13 +173,15 @@ public:
 };
 
 bool wxThreadModule::OnInit() {
 };
 
 bool wxThreadModule::OnInit() {

-  wxMainMutex.Lock();
+  wxMainMutex = new wxMutex();
+  wxMainMutex->Lock();

   return TRUE;
 }
 
 void wxThreadModule::OnExit()
 {
   return TRUE;
 }
 
 void wxThreadModule::OnExit()
 {

-  wxMainMutex.Unlock();
+  wxMainMutex->Unlock();
+  delete wxMainMutex;

 }
 
 IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
 }
 
 IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)