fixed crash on invalid data (patch 1039453)

[wxWidgets.git] / src / generic / scrlwing.cpp

diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index 2eaa60e6cede63565e60306e458688ea73a22788..ba82747eb1b5cec9f1c541a96768b976fe4b0a28 100644 (file)
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -1145,6 +1145,8 @@ void wxScrollHelper::HandleOnMouseLeave(wxMouseEvent& event)
                                     orient
                                 );
         m_timerAutoScroll->Start(50); // FIXME: make configurable
                                     orient
                                 );
         m_timerAutoScroll->Start(50); // FIXME: make configurable

+#else
+        wxUnusedVar(pos);

 #endif
     }
 }
 #endif
     }
 }


@@ -1211,7 +1213,7 @@ bool wxGenericScrolledWindow::Create(wxWindow *parent,
 {
     m_targetWindow = this;
 
 {
     m_targetWindow = this;
 

-    bool ok = wxPanel::Create(parent, id, pos, size, style, name);
+    bool ok = wxPanel::Create(parent, id, pos, size, style|wxHSCROLL|wxVSCROLL, name);

 
     return ok;
 }
 
     return ok;
 }