Use a hidden window to catch the timer messages instead of a timer proc. This fixes an obscure problem where a new activation context is ignored while in the scop of the timer callback. wxPython needs the activation context to always be active.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/msw/timer.cpp

@@ -53,14 +53,48 @@ static wxTimerMap& TimerMap()
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
+  
+LRESULT APIENTRY _EXPORT wxTimerWndProc(HWND hWnd, UINT message,
+                                        WPARAM wParam, LPARAM lParam);
 
-// timer callback used for all timers
+// implemented in utils.cpp
-void WINAPI wxTimerProc(HWND hwnd, UINT msg, UINT_PTR idTimer, DWORD dwTime);
+extern "C" WXDLLIMPEXP_BASE HWND
+wxCreateHiddenWindow(LPCTSTR *pclassname, LPCTSTR classname, WNDPROC wndproc);
+
+
+// ----------------------------------------------------------------------------
+// wxTimerHiddenWindowModule: used to manage the hidden window used for
+// catching timer messages (we need a module to ensure that the window is
+// always deleted)
+// ----------------------------------------------------------------------------
+
+class wxTimerHiddenWindowModule : public wxModule
+{
+public:
+    // module init/finalize
+    virtual bool OnInit();
+    virtual void OnExit();
+
+    // get the hidden window (creates on demand)
+    static HWND GetHWND();
+
+private:
+    // the HWND of the hidden window
+    static HWND ms_hwnd;
+
+    // the class used to create it
+    static const wxChar *ms_className;
+
+    DECLARE_DYNAMIC_CLASS(wxTimerHiddenWindowModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxTimerHiddenWindowModule, wxModule)
 
 // ============================================================================
 // implementation
 // ============================================================================
 
+
 // ----------------------------------------------------------------------------
 // wxMSWTimerImpl class
 // ----------------------------------------------------------------------------
@@ -70,13 +104,12 @@ bool wxMSWTimerImpl::Start(int milliseconds, bool oneShot)
     if ( !wxTimerImpl::Start(milliseconds, oneShot) )
         return false;
 
-    m_id = ::SetTimer
+    m_id = ::SetTimer(
-             (
+        wxTimerHiddenWindowModule::GetHWND(),  // window to send the messages to
-                NULL,                       // don't use window
+        GetId(),                               // timer ID
-                1,                          // id ignored with NULL hwnd anyhow
+        (UINT)m_milli,                         // delay
-                (UINT)m_milli,              // delay
+        NULL                                   // timer proc.  Not used since we pass hwnd
-                wxTimerProc                 // timer proc to call
+        );
-             );
 
     if ( !m_id )
     {
@@ -92,7 +125,7 @@ bool wxMSWTimerImpl::Start(int milliseconds, bool oneShot)
     {
         wxLogError(_("Timer creation failed."));
 
-        ::KillTimer(NULL, m_id);
+        ::KillTimer(wxTimerHiddenWindowModule::GetHWND(), m_id);
         m_id = 0;
 
         return false;
@@ -107,7 +140,7 @@ void wxMSWTimerImpl::Stop()
 {
     wxASSERT_MSG( m_id, _T("should be running") );
 
-    ::KillTimer(NULL, m_id);
+    ::KillTimer(wxTimerHiddenWindowModule::GetHWND(), m_id);
 
     TimerMap().erase(m_id);
 
@@ -128,17 +161,76 @@ void wxProcessTimer(wxMSWTimerImpl& timer)
     timer.Notify();
 }
 
-void WINAPI
+
-wxTimerProc(HWND WXUNUSED(hwnd),
+LRESULT APIENTRY _EXPORT wxTimerWndProc(HWND hWnd, UINT message,
-            UINT WXUNUSED(msg),
+                                        WPARAM wParam, LPARAM lParam)
-            UINT_PTR idTimer,
-            DWORD WXUNUSED(dwTime))
 {
-    wxTimerMap::iterator node = TimerMap().find((unsigned long)idTimer);
+    if ( message == WM_TIMER )
+    {
+        wxTimerMap::iterator node = TimerMap().find((unsigned long)wParam);
 
-    wxCHECK_RET( node != TimerMap().end(), wxT("bogus timer id in wxTimerProc") );
+        wxCHECK_MSG( node != TimerMap().end(), 0, wxT("bogus timer id in wxTimerProc") );
 
-    wxProcessTimer(*(node->second));
+        wxProcessTimer(*(node->second));
+    }
+    else
+    {
+        return ::DefWindowProc(hWnd, message, wParam, lParam);
+    }
+    return 0;
+}
+
+// ----------------------------------------------------------------------------
+// wxTimerHiddenWindowModule functions
+// ----------------------------------------------------------------------------
+
+
+HWND wxTimerHiddenWindowModule::ms_hwnd = NULL;
+
+const wxChar *wxTimerHiddenWindowModule::ms_className = NULL;
+
+bool wxTimerHiddenWindowModule::OnInit()
+{
+    ms_hwnd = NULL;
+    ms_className = NULL;
+
+    return true;
+}
+
+void wxTimerHiddenWindowModule::OnExit()
+{
+    if ( ms_hwnd )
+    {
+        if ( !::DestroyWindow(ms_hwnd) )
+        {
+            wxLogLastError(_T("DestroyWindow(wxTimerHiddenWindow)"));
+        }
+
+        ms_hwnd = NULL;
+    }
+
+    if ( ms_className )
+    {
+        if ( !::UnregisterClass(ms_className, wxGetInstance()) )
+        {
+            wxLogLastError(_T("UnregisterClass(\"wxTimerHiddenWindow\")"));
+        }
+
+        ms_className = NULL;
+    }
+}
+
+/* static */
+HWND wxTimerHiddenWindowModule::GetHWND()
+{
+    static const wxChar *HIDDEN_WINDOW_CLASS = _T("wxTimerHiddenWindow");
+    if ( !ms_hwnd )
+    {
+        ms_hwnd = wxCreateHiddenWindow(&ms_className, HIDDEN_WINDOW_CLASS,
+                                     wxTimerWndProc);
+    }
+
+    return ms_hwnd;
 }
 
 #endif // wxUSE_TIMER