All wxScrolledWindows shoudl have wxHSCROLL|wxVSCROLL now.

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

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index 8216a1578e1533bbd1bfd59306e992d91a27579a..bb29c3e968d9eb0633cbf6db171fe534310bb25c 100644 (file)
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -190,7 +190,7 @@ void wxPrintout::GetPageInfo(int *minPage, int *maxPage, int *fromPage, int *toP
 //     this style it simply doesn't work correctly at all...
 wxPreviewCanvas::wxPreviewCanvas(wxPrintPreviewBase *preview, wxWindow *parent,
                                  const wxPoint& pos, const wxSize& size, long style, const wxString& name):
 //     this style it simply doesn't work correctly at all...
 wxPreviewCanvas::wxPreviewCanvas(wxPrintPreviewBase *preview, wxWindow *parent,
                                  const wxPoint& pos, const wxSize& size, long style, const wxString& name):

-wxScrolledWindow(parent, -1, pos, size, style | wxFULL_REPAINT_ON_RESIZE | wxVSCROLL | wxHSCROLL, name)
+wxScrolledWindow(parent, -1, pos, size, style | wxFULL_REPAINT_ON_RESIZE, name)

 {
     m_printPreview = preview;
 #ifdef __WXMAC__
 {
     m_printPreview = preview;
 #ifdef __WXMAC__

diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index 785629edb5fa137088b1bf2cf746ab482eff5587..ba82747eb1b5cec9f1c541a96768b976fe4b0a28 100644 (file)
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -1213,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;
 }