compilation fix for Borland C++

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

diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h
index fb63cda2d9f51cd3e6bf330355bfccfca604f057..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,7 +69,12 @@ 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();
+

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


@@ -92,6 +98,15 @@ public:
     virtual bool HandleSettingChange(WXWPARAM wParam, WXLPARAM lParam);
 #endif
 
     virtual bool HandleSettingChange(WXWPARAM wParam, WXLPARAM lParam);
 #endif
 

+    // translate wxWidgets flags to Windows ones
+    virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const;
+
+    // choose the right parent to use with CreateWindow()
+    virtual WXHWND MSWGetParent() const;
+
+    // window proc for the frames
+    WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+

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


@@ -111,14 +126,13 @@ protected:
     // common part of Iconize(), Maximize() and Restore()
     void DoShowWindow(int nShowCmd);
 
     // common part of Iconize(), Maximize() and Restore()
     void DoShowWindow(int nShowCmd);
 

-    // translate wxWidgets flags to Windows ones
-    virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const;
-
-    // choose the right parent to use with CreateWindow()
-    virtual WXHWND MSWGetParent() const;
+    // 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__

 
 

-    // window proc for the frames
-    WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);

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