don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/univ/window.h b/include/wx/univ/window.h
index 65f24a80003b97990b6aca76f60195aa6bf894d6..1dc43df0243dd8f21eae57e4b5b377d44b04cc4c 100644 (file)
--- a/include/wx/univ/window.h
+++ b/include/wx/univ/window.h
@@ -16,12 +16,19 @@
 
 #include "wx/bitmap.h"      // for m_bitmapBg
 
 
 #include "wx/bitmap.h"      // for m_bitmapBg
 

-class WXDLLEXPORT wxControlRenderer;
-class WXDLLEXPORT wxEventLoop;
-class WXDLLEXPORT wxMenu;
-class WXDLLEXPORT wxMenuBar;
-class WXDLLEXPORT wxRenderer;
-class WXDLLEXPORT wxScrollBar;
+class WXDLLIMPEXP_FWD_CORE wxControlRenderer;
+class WXDLLIMPEXP_FWD_CORE wxEventLoop;
+
+#if wxUSE_MENUS
+    class WXDLLIMPEXP_FWD_CORE wxMenu;
+    class WXDLLIMPEXP_FWD_CORE wxMenuBar;
+#endif // wxUSE_MENUS
+
+class WXDLLIMPEXP_FWD_CORE wxRenderer;
+
+#if wxUSE_SCROLLBAR
+    class WXDLLIMPEXP_FWD_CORE wxScrollBar;
+#endif // wxUSE_SCROLLBAR

 
 #ifdef __WXX11__
 #define wxUSE_TWO_WINDOWS 1
 
 #ifdef __WXX11__
 #define wxUSE_TWO_WINDOWS 1


@@ -45,7 +52,7 @@ class WXDLLEXPORT wxScrollBar;
 #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


@@ -95,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;


@@ -125,11 +132,13 @@ public:
     // set the "highlighted" flag and return true if it changed
     virtual bool SetCurrent(bool doit = true);
 
     // set the "highlighted" flag and return true if it changed
     virtual bool SetCurrent(bool doit = true);
 

+#if wxUSE_SCROLLBAR

     // get the scrollbar (may be NULL) for the given orientation
     wxScrollBar *GetScrollbar(int orient) const
     {
         return orient & wxVERTICAL ? m_scrollbarVert : m_scrollbarHorz;
     }
     // get the scrollbar (may be NULL) for the given orientation
     wxScrollBar *GetScrollbar(int orient) const
     {
         return orient & wxVERTICAL ? m_scrollbarVert : m_scrollbarHorz;
     }

+#endif // wxUSE_SCROLLBAR

 
     // methods used by wxColourScheme to choose the colours for this window
     // --------------------------------------------------------------------
 
     // methods used by wxColourScheme to choose the colours for this window
     // --------------------------------------------------------------------


@@ -181,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();


@@ -256,9 +275,12 @@ public:
 #endif // __WXMSW__
 
 private:
 #endif // __WXMSW__
 
 private:

+
+#if wxUSE_SCROLLBAR

     // the window scrollbars
     wxScrollBar *m_scrollbarHorz,
                 *m_scrollbarVert;
     // the window scrollbars
     wxScrollBar *m_scrollbarHorz,
                 *m_scrollbarVert;

+#endif // wxUSE_SCROLLBAR

 
 #if wxUSE_MENUS
     // the current modal event loop for the popup menu we show or NULL
 
 #if wxUSE_MENUS
     // the current modal event loop for the popup menu we show or NULL