no changes, just remove #if'd out code

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

diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h
index 44c5141a12d68753076fbe327570478f786e16d9..43721fa25fe4921d097508df75562b8c8ba6c494 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


@@ -52,10 +52,9 @@ public:
     virtual bool IsMaximized() const;
     virtual void Iconize(bool iconize = true);
     virtual bool IsIconized() const;
     virtual bool IsMaximized() const;
     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 void SetIcons(const wxIconBundle& icons );
     virtual void Restore();

-    
+

     virtual void SetLayoutDirection(wxLayoutDirection dir);
 
 #ifndef __WXWINCE__
     virtual void SetLayoutDirection(wxLayoutDirection dir);
 
 #ifndef __WXWINCE__


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

-    
+

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


@@ -108,6 +107,9 @@ public:
     // window proc for the frames
     WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
     // window proc for the frames
     WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 

+    // returns true if the platform should explicitly apply a theme border
+    virtual bool CanApplyThemeBorder() const { return false; }
+

 protected:
     // common part of all ctors
     void Init();
 protected:
     // common part of all ctors
     void Init();


@@ -127,6 +129,24 @@ protected:
     // common part of Iconize(), Maximize() and Restore()
     void DoShowWindow(int nShowCmd);
 
     // common part of Iconize(), Maximize() and Restore()
     void DoShowWindow(int nShowCmd);
 

+    // override those to return the normal window coordinates even when the
+    // window is minimized
+#ifndef __WXWINCE__
+    virtual void DoGetPosition(int *x, int *y) const;
+    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();
+
+    // 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);
+
+

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


@@ -186,7 +206,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_