Renamed internal GetClientWindow to GetClientAreaWindow so

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

diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h
index fc21871ac36c2ede9636e8c60ba6d1b2e8c85277..d09a48ce0a30ae392d674773cca06010fbb7ac04 100644 (file)
--- a/include/wx/msw/toplevel.h
+++ b/include/wx/msw/toplevel.h
@@ -70,6 +70,13 @@ public:
     // implementation from now on
     // --------------------------
 
     // 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();
 protected:
     // common part of all ctors
     void Init();


@@ -89,19 +96,12 @@ protected:
     // common part of Iconize(), Maximize() and Restore()
     void DoShowWindow(int nShowCmd);
 
     // 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;
 
     // choose the right parent to use with CreateWindow()
     virtual WXHWND MSWGetParent() const;
 
     // translate wxWindows flags to Windows ones
     virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const;
 
     // choose the right parent to use with CreateWindow()
     virtual WXHWND MSWGetParent() const;
 

-    // we handle WM_NCACTIVATE specially here
-    virtual long MSWWindowProc(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam);
-

     // is the window currently iconized?
     bool m_iconized;
 
     // is the window currently iconized?
     bool m_iconized;
 


@@ -116,9 +116,14 @@ protected:
     bool                  m_fsIsMaximized;
     bool                  m_fsIsShowing;
 
     bool                  m_fsIsMaximized;
     bool                  m_fsIsShowing;
 

+    // the last focused child: we restore focus to it on activation
+    wxWindow             *m_winLastFocused;
+

     // the hidden parent window for the frames which shouldn't appear in the
     // taskbar
     static wxWindow *ms_hiddenParent;
     // the hidden parent window for the frames which shouldn't appear in the
     // taskbar
     static wxWindow *ms_hiddenParent;

+
+    DECLARE_EVENT_TABLE()

 };
 
 // list of all frames and modeless dialogs
 };
 
 // list of all frames and modeless dialogs