changed hardware at York

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

diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp
index bfcc9870fb2b2364a4bd293b4e938a69af65ba8d..6297621fd0987ed604d8fa6682693ad88f4f1b18 100644 (file)
--- a/src/univ/winuniv.cpp
+++ b/src/univ/winuniv.cpp
@@ -471,8 +471,7 @@ bool wxWindow::Enable(bool enable)
 
 bool wxWindow::IsFocused() const
 {
-    wxWindow *self = wxConstCast(this, wxWindow);
-    return self->FindFocus() == self;
+    return FindFocus() == this;
 }
 
 bool wxWindow::IsPressed() const
@@ -932,9 +931,9 @@ void wxWindow::SetScrollbar(int orient,
 void wxWindow::SetScrollPos(int orient, int pos, bool WXUNUSED(refresh))
 {
     wxScrollBar *scrollbar = GetScrollbar(orient);
-    wxCHECK_RET( scrollbar, _T("no scrollbar to set position for") );
 
-    scrollbar->SetThumbPosition(pos);
+    if (scrollbar)
+        scrollbar->SetThumbPosition(pos);
 
     // VZ: I think we can safely ignore this as we always refresh it
     //     automatically whenever the value chanegs