changed wxUSE_MS_HTML_HELP to 1 by default

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

diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h
index 1bbcc2dcaa2c64008a7f7cdb475e38d843dc9929..85bf00c07286e73bdf65aa09012b2d9f10c7ead7 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);
@@ -80,7 +81,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,11 +89,8 @@ protected:
     // common part of Iconize(), Maximize() and Restore()
     void DoShowWindow(int nShowCmd);
 
-    // 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;
+    // translate wxWindows flags to Windows ones
+    virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const;
 
     // is the frame currently iconized?
     bool m_iconized;