restored inline for wxCriticalSection methods for !MSW

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

diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h
index 1bbcc2dcaa2c64008a7f7cdb475e38d843dc9929..6f14456c2ee2e4efc1f089b9a602ada9572794f4 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 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);
     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
 
     // 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);
                       const wxString& title,
                       const wxPoint& pos,
                       const wxSize& size);


@@ -88,13 +89,17 @@ protected:
     // common part of Iconize(), Maximize() and Restore()
     void DoShowWindow(int nShowCmd);
 
     // 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;
+    // prevent the window from being deactivated sometimes (see comments in the
+    // code)
+    long HandleNcActivate(bool activate);

 
 

-    // is the frame currently iconized?
+    // 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;
+
+    // is the window currently iconized?

     bool m_iconized;
 
     // should the frame be maximized when it will be shown? set by Maximize()
     bool m_iconized;
 
     // should the frame be maximized when it will be shown? set by Maximize()


@@ -107,6 +112,10 @@ protected:
     long                  m_fsOldWindowStyle;
     bool                  m_fsIsMaximized;
     bool                  m_fsIsShowing;
     long                  m_fsOldWindowStyle;
     bool                  m_fsIsMaximized;
     bool                  m_fsIsShowing;

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

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