fix Alt-letter navigation with spin controls (bug 672974)

[wxWidgets.git] / include / wx / msw / toplevel.h

diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h
index 6f14456c2ee2e4efc1f089b9a602ada9572794f4..b4e77b09da5289bb6c62a2e1e3c083fde4de2abc 100644 (file)
--- a/include/wx/msw/toplevel.h
+++ b/include/wx/msw/toplevel.h
@@ -70,6 +70,13 @@ public:
     // implementation from now on
     // --------------------------
 
+    // event handlers
+    void OnActivate(wxActivateEvent& event);
+
+    // called by wxWindow whenever it gets focus
+    void SetLastFocus(wxWindow *win) { m_winLastFocused = win; }
+    wxWindow *GetLastFocus() const { return m_winLastFocused; }
+
 protected:
     // common part of all ctors
     void Init();
@@ -89,10 +96,6 @@ protected:
     // common part of Iconize(), Maximize() and Restore()
     void DoShowWindow(int nShowCmd);
 
-    // prevent the window from being deactivated sometimes (see comments in the
-    // code)
-    long HandleNcActivate(bool activate);
-
     // translate wxWindows flags to Windows ones
     virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const;
 
@@ -113,9 +116,11 @@ protected:
     bool                  m_fsIsMaximized;
     bool                  m_fsIsShowing;
 
-    // the hidden parent window for the frames which shouldn't appear in the
-    // taskbar
-    static wxWindow *ms_hiddenParent;
+    // the last focused child: we restore focus to it on activation
+    wxWindow             *m_winLastFocused;
+
+    DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxTopLevelWindowMSW)
 };
 
 // list of all frames and modeless dialogs