use wxFULL_REPAINT_ON_RESIZE only for wxPreviewCanvas, not for the entire wxPreviewFr...

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

diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h
index 829d17f87a6a349b67118b8c75b282ca5d4abc68..d7ed29ed22e001d45c8cf6122251b24d8a7f2c27 100644 (file)
--- a/include/wx/prntbase.h
+++ b/include/wx/prntbase.h
@@ -197,7 +197,7 @@ public:
                    const wxString& title = wxT("Print Preview"),
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
-                   long style = wxDEFAULT_FRAME_STYLE|wxFULL_REPAINT_ON_RESIZE,
+                   long style = wxDEFAULT_FRAME_STYLE,
                    const wxString& name = wxT("frame"));
     ~wxPreviewFrame();
 

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index 7545ff42a35eff09f189614c85fb047bd3a4899a..afd9f47e2591949200a1e928457bc2efd00c9e2e 100644 (file)
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -184,9 +184,13 @@ void wxPrintout::GetPageInfo(int *minPage, int *maxPage, int *fromPage, int *toP
 * Preview canvas
 */
 
+// VZ: the current code doesn't refresh properly without
+//     wxFULL_REPAINT_ON_RESIZE, this must be fixed as otherwise we have
+//     really horrible flicker when resizing the preview frame, but without
+//     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, name)
+wxScrolledWindow(parent, -1, pos, size, style | wxFULL_REPAINT_ON_RESIZE, name)
 {
     m_printPreview = preview;
 #ifdef __WXMAC__