Moved deprecated code to source file (didn't compile

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

diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h
index 64359f658d10943442ddf683f5b17c2cad8e8842..48e7e512e4cda6450a498440d66e350768f5b410 100644 (file)
--- a/include/wx/msw/toplevel.h
+++ b/include/wx/msw/toplevel.h
@@ -52,10 +52,11 @@ 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 bool SetShape(const wxRegion& region);
 #endif // __WXWINCE__
 #ifndef __WXWINCE__
     virtual bool SetShape(const wxRegion& region);
 #endif // __WXWINCE__


@@ -68,13 +69,13 @@ public:
 
     // wxMSW only: EnableCloseButton(false) may be used to remove the "Close"
     // button from the title bar
 
     // wxMSW only: EnableCloseButton(false) may be used to remove the "Close"
     // button from the title bar

-    bool EnableCloseButton(bool enable = true);
+    virtual bool EnableCloseButton(bool enable = true);

 
     // Set window transparency if the platform supports it
     virtual bool SetTransparent(wxByte alpha);
     virtual bool CanSetTransparent();
 
 
     // Set window transparency if the platform supports it
     virtual bool SetTransparent(wxByte alpha);
     virtual bool CanSetTransparent();
 

-    
+

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


@@ -125,6 +126,14 @@ 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__
+
+

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