More fixes for !wxUSE_TIMER, !wxUSE_IMAGE

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/rgncmn.cpp b/src/common/rgncmn.cpp
index c4fb8fae0b5be9258dca8753724553140af8e423..41b273e76c123fcafd185384c16654c831e0f6c9 100644 (file)
--- a/src/common/rgncmn.cpp
+++ b/src/common/rgncmn.cpp
@@ -23,7 +23,9 @@
 
 #include "wx/region.h"
 #include "wx/bitmap.h"
+#if wxUSE_IMAGE
 #include "wx/image.h"
+#endif
 #include "wx/dcmemory.h"
 
 
@@ -52,6 +54,7 @@ bool wxRegion::Union(const wxBitmap& bmp,
                      const wxColour& transColour,
                      int   tolerance)
 {
+#if wxUSE_IMAGE
     unsigned char loR, loG, loB;
     unsigned char hiR, hiG, hiB;
 
@@ -114,6 +117,10 @@ bool wxRegion::Union(const wxBitmap& bmp,
     }
 
     return TRUE;
+#else
+    // No wxImage support
+    return FALSE;
+#endif
 }
 
 //---------------------------------------------------------------------------

diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp
index 5f7f0074c3274a8a91019278d8389d8105c6689f..83c9d278f18af7d67ef493884c247615db861ba0 100644 (file)
--- a/src/generic/renderg.cpp
+++ b/src/generic/renderg.cpp
@@ -311,6 +311,19 @@ wxRendererGeneric::DrawSplitterSash(wxWindow *win,
         offset = 3;
     }
 
+    // We need to erase any droppings left behind on
+    // the splitter background
+    if ( win->HasFlag(wxSP_3DBORDER) )
+    {
+        wxPen pen(win->GetBackgroundColour());
+        dc.SetPen(pen);
+
+        dc.DrawLine(2, 2, size.x - 2, 2);
+        dc.DrawLine(2, h - 2, size.x - 2, h - 2);
+
+        dc.SetPen(wxNullPen);
+    }
+
     // from left to right
     if ( win->HasFlag(wxSP_3D) )
     {

diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index f868dd053bcf13eb7dbf7b03e929e0c3ccc20800..46b409c65dc0b6c6beb3f029d8c5c53f5e8f4347 100644 (file)
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -40,7 +40,9 @@
 
 #include "wx/scrolwin.h"
 #include "wx/panel.h"
+#if wxUSE_TIMER
 #include "wx/timer.h"
+#endif
 #include "wx/sizer.h"
 
 #ifdef __WXMSW__
@@ -91,6 +93,7 @@ private:
     DECLARE_NO_COPY_CLASS(wxScrollHelperEvtHandler)
 };
 
+#if wxUSE_TIMER
 // ----------------------------------------------------------------------------
 // wxAutoScrollTimer: the timer used to generate a stream of scroll events when
 // a captured mouse is held outside the window
@@ -175,6 +178,7 @@ void wxAutoScrollTimer::Notify()
         }
     }
 }
+#endif
 
 // ----------------------------------------------------------------------------
 // wxScrollHelperEvtHandler
@@ -1072,11 +1076,13 @@ bool wxScrollHelper::SendAutoScrollEvents(wxScrollWinEvent& event) const
 
 void wxScrollHelper::StopAutoScrolling()
 {
+#if wxUSE_TIMER
     if ( m_timerAutoScroll )
     {
         delete m_timerAutoScroll;
         m_timerAutoScroll = (wxTimer *)NULL;
     }
+#endif
 }
 
 void wxScrollHelper::HandleOnMouseEnter(wxMouseEvent& event)
@@ -1138,6 +1144,7 @@ void wxScrollHelper::HandleOnMouseLeave(wxMouseEvent& event)
         if ( !m_targetWindow->HasScrollbar(orient) )
             return;
 
+#if wxUSE_TIMER
         delete m_timerAutoScroll;
         m_timerAutoScroll = new wxAutoScrollTimer
                                 (
@@ -1148,6 +1155,7 @@ void wxScrollHelper::HandleOnMouseLeave(wxMouseEvent& event)
                                     orient
                                 );
         m_timerAutoScroll->Start(50); // FIXME: make configurable
+#endif
     }
 }