Fix XTI compilation in STL build.

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

diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h
index 3938b96e62b8f114d41c56b5e3edfc46baa5a170..52905cc32a5e831555331c51165578546f51bc5c 100644 (file)
--- a/include/wx/msw/toplevel.h
+++ b/include/wx/msw/toplevel.h
@@ -16,7 +16,7 @@
 // wxTopLevelWindowMSW
 // ----------------------------------------------------------------------------
 
 // wxTopLevelWindowMSW
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxTopLevelWindowMSW : public wxTopLevelWindowBase
+class WXDLLIMPEXP_CORE wxTopLevelWindowMSW : public wxTopLevelWindowBase

 {
 public:
     // constructors and such
 {
 public:
     // constructors and such


@@ -64,6 +64,7 @@ public:
 
     virtual bool Show(bool show = true);
 
 
     virtual bool Show(bool show = true);
 

+    virtual void ShowWithoutActivating();

     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
     virtual bool IsFullScreen() const { return m_fsIsShowing; }
 
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
     virtual bool IsFullScreen() const { return m_fsIsShowing; }
 


@@ -75,12 +76,6 @@ public:
     virtual bool SetTransparent(wxByte alpha);
     virtual bool CanSetTransparent();
 
     virtual bool SetTransparent(wxByte alpha);
     virtual bool CanSetTransparent();
 

-    //Top level windows have different freeze semantics on Windows
-    virtual void Freeze();
-    virtual void Thaw();
-
-    virtual void AddChild( wxWindowBase *child );
-

 
     // implementation from now on
     // --------------------------
 
     // implementation from now on
     // --------------------------


@@ -142,6 +137,24 @@ protected:
     virtual void DoGetSize(int *width, int *height) const;
 #endif // __WXWINCE__
 
     virtual void DoGetSize(int *width, int *height) const;
 #endif // __WXWINCE__
 

+    // Top level windows have different freeze semantics on Windows
+    virtual void DoFreeze();
+    virtual void DoThaw();
+
+    virtual void DoEnable(bool enable);
+
+    // helper of SetIcons(): calls gets the icon with the size specified by the
+    // given system metrics (SM_C{X|Y}[SM]ICON) from the bundle and sets it
+    // using WM_SETICON with the specified wParam (ICOM_SMALL or ICON_BIG);
+    // returns true if the icon was set
+    bool DoSelectAndSetIcon(const wxIconBundle& icons, int smX, int smY, int i);
+
+    // override wxWindow virtual method to use CW_USEDEFAULT if necessary
+    virtual void MSWGetCreateWindowCoords(const wxPoint& pos,
+                                          const wxSize& size,
+                                          int& x, int& y,
+                                          int& w, int& h) const;
+

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


@@ -202,7 +215,7 @@ private:
 #endif
 
     DECLARE_EVENT_TABLE()
 #endif
 
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxTopLevelWindowMSW)
+    wxDECLARE_NO_COPY_CLASS(wxTopLevelWindowMSW);

 };
 
 #endif // _WX_MSW_TOPLEVEL_H_
 };
 
 #endif // _WX_MSW_TOPLEVEL_H_