Implement basic support for virtual file systems for the ie backend. Registering...

[wxWidgets.git] / include / wx / univ / window.h

diff --git a/include/wx/univ/window.h b/include/wx/univ/window.h
index fe6a23f7bda471faa180496cd4285f266d441b9d..d5aa30e4ba67277e1892f0ebb04603a9032bcc0c 100644 (file)
--- a/include/wx/univ/window.h
+++ b/include/wx/univ/window.h
@@ -16,18 +16,18 @@
 
 #include "wx/bitmap.h"      // for m_bitmapBg
 
 
 #include "wx/bitmap.h"      // for m_bitmapBg
 

-class WXDLLEXPORT wxControlRenderer;
-class WXDLLEXPORT wxEventLoop;
+class WXDLLIMPEXP_FWD_CORE wxControlRenderer;
+class WXDLLIMPEXP_FWD_CORE wxEventLoop;

 
 #if wxUSE_MENUS
 
 #if wxUSE_MENUS

-    class WXDLLEXPORT wxMenu;
-    class WXDLLEXPORT wxMenuBar;
+    class WXDLLIMPEXP_FWD_CORE wxMenu;
+    class WXDLLIMPEXP_FWD_CORE wxMenuBar;

 #endif // wxUSE_MENUS
 
 #endif // wxUSE_MENUS
 

-class WXDLLEXPORT wxRenderer;
+class WXDLLIMPEXP_FWD_CORE wxRenderer;

 
 #if wxUSE_SCROLLBAR
 
 #if wxUSE_SCROLLBAR

-    class WXDLLEXPORT wxScrollBar;
+    class WXDLLIMPEXP_FWD_CORE wxScrollBar;

 #endif // wxUSE_SCROLLBAR
 
 #ifdef __WXX11__
 #endif // wxUSE_SCROLLBAR
 
 #ifdef __WXX11__


@@ -52,7 +52,7 @@ class WXDLLEXPORT wxRenderer;
 #define wxWindowNative wxWindowMac
 #endif
 
 #define wxWindowNative wxWindowMac
 #endif
 

-class WXDLLEXPORT wxWindow : public wxWindowNative
+class WXDLLIMPEXP_CORE wxWindow : public wxWindowNative

 {
 public:
     // ctors and create functions
 {
 public:
     // ctors and create functions


@@ -102,7 +102,7 @@ public:
     virtual int GetScrollThumb(int orient) const;
     virtual int GetScrollRange(int orient) const;
     virtual void ScrollWindow(int dx, int dy,
     virtual int GetScrollThumb(int orient) const;
     virtual int GetScrollRange(int orient) const;
     virtual void ScrollWindow(int dx, int dy,

-                              const wxRect* rect = (wxRect *) NULL);
+                              const wxRect* rect = NULL);

 
     // take into account the borders here
     virtual wxPoint GetClientAreaOrigin() const;
 
     // take into account the borders here
     virtual wxPoint GetClientAreaOrigin() const;


@@ -190,6 +190,16 @@ public:
     // should we use the standard control colours or not?
     virtual bool ShouldInheritColours() const { return false; }
 
     // should we use the standard control colours or not?
     virtual bool ShouldInheritColours() const { return false; }
 

+    virtual bool IsClientAreaChild(const wxWindow *child) const
+    {
+#if wxUSE_SCROLLBAR
+        if ( child == (wxWindow*)m_scrollbarHorz ||
+             child == (wxWindow*)m_scrollbarVert )
+            return false;
+#endif
+        return wxWindowNative::IsClientAreaChild(child);
+    }
+

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


@@ -233,6 +243,9 @@ protected:
     virtual wxSize DoGetBestClientSize() const;
     virtual wxSize DoGetBestSize() const;
 
     virtual wxSize DoGetBestClientSize() const;
     virtual wxSize DoGetBestSize() const;
 

+    // override the base class method to return the size of the window borders
+    virtual wxSize DoGetBorderSize() const;
+

     // adjust the size of the window to take into account its borders
     wxSize AdjustSize(const wxSize& size) const;
 
     // adjust the size of the window to take into account its borders
     wxSize AdjustSize(const wxSize& size) const;