#undef LoadIcon() too

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

diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h
index f6a42ff4b7701b4445f6379088d4d94b576a0965..b4e77b09da5289bb6c62a2e1e3c083fde4de2abc 100644 (file)
--- a/include/wx/msw/toplevel.h
+++ b/include/wx/msw/toplevel.h
@@ -55,6 +55,7 @@ public:
     virtual void Iconize(bool iconize = TRUE);
     virtual bool IsIconized() const;
     virtual void SetIcon(const wxIcon& icon);
+    virtual void SetIcons(const wxIconBundle& icons );
     virtual void Restore();
 
     virtual bool Show(bool show = TRUE);
@@ -69,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();
@@ -80,7 +88,7 @@ protected:
 
     // create a new dialog using the given dialog template from resources,
     // return FALSE if it couldn't be created
-    bool CreateDialog(const wxChar *dlgTemplate,
+    bool CreateDialog(const void *dlgTemplate,
                       const wxString& title,
                       const wxPoint& pos,
                       const wxSize& size);
@@ -88,17 +96,13 @@ protected:
     // common part of Iconize(), Maximize() and Restore()
     void DoShowWindow(int nShowCmd);
 
-    // implement the geometry-related methods for a top level window
-    virtual void DoSetClientSize(int width, int height);
-    virtual void DoGetClientSize(int *width, int *height) const;
+    // translate wxWindows flags to Windows ones
+    virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const;
 
-    // get the MSW window flags corresponding to wxWindows ones
-    //
-    // the functions returns the flags (WS_XXX) directly and puts the ext
-    // (WS_EX_XXX) flags into the provided pointer if not NULL
-    long MSWGetCreateWindowFlags(long *exflags) const;
+    // choose the right parent to use with CreateWindow()
+    virtual WXHWND MSWGetParent() const;
 
-    // is the frame currently iconized?
+    // is the window currently iconized?
     bool m_iconized;
 
     // should the frame be maximized when it will be shown? set by Maximize()
@@ -111,6 +115,12 @@ protected:
     long                  m_fsOldWindowStyle;
     bool                  m_fsIsMaximized;
     bool                  m_fsIsShowing;
+
+    // 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