use GetCharHeight in GetHeight() instead of creating temporary wxClientDC

[wxWidgets.git] / src / univ / scrolbar.cpp

diff --git a/src/univ/scrolbar.cpp b/src/univ/scrolbar.cpp
index 1acda8478341390b4dcb30462c30018f05818e4d..f446c73f340bdb26b8656f0d271e60522253d7e9 100644 (file)
--- a/src/univ/scrolbar.cpp
+++ b/src/univ/scrolbar.cpp
@@ -553,7 +553,7 @@ bool wxScrollBar::PerformAction(const wxControlAction& action,
             wxScrollEvent event(scrollType, this->GetId(), m_thumbPos,
                                 IsVertical() ? wxVERTICAL : wxHORIZONTAL);
             event.SetEventObject(this);
             wxScrollEvent event(scrollType, this->GetId(), m_thumbPos,
                                 IsVertical() ? wxVERTICAL : wxHORIZONTAL);
             event.SetEventObject(this);

-            GetParent()->GetEventHandler()->ProcessEvent(event);
+            GetEventHandler()->ProcessEvent(event);

         }
         else // part of the window
         {
         }
         else // part of the window
         {


@@ -907,6 +907,8 @@ bool wxStdScrollBarInputHandler::HandleMouseMove(wxInputConsumer *consumer,
 
 #endif // wxUSE_SCROLLBAR
 
 
 #endif // wxUSE_SCROLLBAR
 

+#if wxUSE_TIMER
+

 // ----------------------------------------------------------------------------
 // wxScrollTimer
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxScrollTimer
 // ----------------------------------------------------------------------------


@@ -949,3 +951,5 @@ void wxScrollTimer::Notify()
         (void)DoNotify();
     }
 }
         (void)DoNotify();
     }
 }

+
+#endif // wxUSE_TIMER