really show the window after creation (calling Show(TRUE) doesn't do it any more)

[wxWidgets.git] / src / common / prntbase.cpp

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index 581a057ba31e1fa7888ccb78cfe4c356f112660c..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
 */
 
 * 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):
 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__
 {
     m_printPreview = preview;
 #ifdef __WXMAC__


@@ -195,7 +199,7 @@ wxScrolledWindow(parent, -1, pos, size, style, name)
     wxSystemColour colourIndex = wxSYS_COLOUR_3DDKSHADOW;
 #else
     wxSystemColour colourIndex = wxSYS_COLOUR_APPWORKSPACE;
     wxSystemColour colourIndex = wxSYS_COLOUR_3DDKSHADOW;
 #else
     wxSystemColour colourIndex = wxSYS_COLOUR_APPWORKSPACE;

-#endif    
+#endif

     SetBackgroundColour(wxSystemSettings::GetColour(colourIndex));
 
     SetScrollbars(10, 10, 100, 100);
     SetBackgroundColour(wxSystemSettings::GetColour(colourIndex));
 
     SetScrollbars(10, 10, 100, 100);


@@ -232,7 +236,7 @@ void wxPreviewCanvas::OnSysColourChanged(wxSysColourChangedEvent& event)
     wxSystemColour colourIndex = wxSYS_COLOUR_3DDKSHADOW;
 #else
     wxSystemColour colourIndex = wxSYS_COLOUR_APPWORKSPACE;
     wxSystemColour colourIndex = wxSYS_COLOUR_3DDKSHADOW;
 #else
     wxSystemColour colourIndex = wxSYS_COLOUR_APPWORKSPACE;

-#endif    
+#endif

     SetBackgroundColour(wxSystemSettings::GetColour(colourIndex));
     Refresh();
 
     SetBackgroundColour(wxSystemSettings::GetColour(colourIndex));
     Refresh();
 


@@ -247,7 +251,7 @@ void wxPreviewCanvas::OnChar(wxKeyEvent &event)
     {
         ((wxPreviewFrame*) GetParent())->Close(TRUE);
         return;
     {
         ((wxPreviewFrame*) GetParent())->Close(TRUE);
         return;

-    }    
+    }

     else if (event.GetKeyCode() == WXK_TAB)
     {
         controlBar->OnGoto();
     else if (event.GetKeyCode() == WXK_TAB)
     {
         controlBar->OnGoto();


@@ -264,7 +268,7 @@ void wxPreviewCanvas::OnChar(wxKeyEvent &event)
         event.Skip();
         return;
     }
         event.Skip();
         return;
     }

-    
+

     switch(event.GetKeyCode())
     {
         case WXK_NEXT:
     switch(event.GetKeyCode())
     {
         case WXK_NEXT:


@@ -433,58 +437,58 @@ void wxPreviewControlBar::CreateButtons()
     SetSize(0, 0, 400, 40);
 
     wxBoxSizer *item0 = new wxBoxSizer( wxHORIZONTAL );
     SetSize(0, 0, 400, 40);
 
     wxBoxSizer *item0 = new wxBoxSizer( wxHORIZONTAL );

-    
+

     int smallButtonWidth = 45;
     int smallButtonWidth = 45;

-    
+

     m_closeButton = new wxButton( this, wxID_PREVIEW_CLOSE, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 );
     item0->Add( m_closeButton, 0, wxALIGN_CENTRE|wxALL, 5 );
     m_closeButton = new wxButton( this, wxID_PREVIEW_CLOSE, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 );
     item0->Add( m_closeButton, 0, wxALIGN_CENTRE|wxALL, 5 );

-    
+

     if (m_buttonFlags & wxPREVIEW_PRINT)
     {
         m_printButton = new wxButton( this, wxID_PREVIEW_PRINT, _("&Print..."), wxDefaultPosition, wxDefaultSize, 0 );
         item0->Add( m_printButton, 0, wxALIGN_CENTRE|wxALL, 5 );
     }
     if (m_buttonFlags & wxPREVIEW_PRINT)
     {
         m_printButton = new wxButton( this, wxID_PREVIEW_PRINT, _("&Print..."), wxDefaultPosition, wxDefaultSize, 0 );
         item0->Add( m_printButton, 0, wxALIGN_CENTRE|wxALL, 5 );
     }

-    
+

     if (m_buttonFlags & wxPREVIEW_FIRST)
     {
         m_firstPageButton = new wxButton( this, wxID_PREVIEW_FIRST, _("|<<"), wxDefaultPosition, wxSize(smallButtonWidth,-1), 0 );
         item0->Add( m_firstPageButton, 0, wxALIGN_CENTRE|wxALL, 5 );
     }
     if (m_buttonFlags & wxPREVIEW_FIRST)
     {
         m_firstPageButton = new wxButton( this, wxID_PREVIEW_FIRST, _("|<<"), wxDefaultPosition, wxSize(smallButtonWidth,-1), 0 );
         item0->Add( m_firstPageButton, 0, wxALIGN_CENTRE|wxALL, 5 );
     }

-    
+

     if (m_buttonFlags & wxPREVIEW_PREVIOUS)
     {
         m_previousPageButton = new wxButton( this, wxID_PREVIEW_PREVIOUS, _("<<"), wxDefaultPosition, wxSize(smallButtonWidth,-1), 0 );
         item0->Add( m_previousPageButton, 0, wxALIGN_CENTRE|wxRIGHT|wxTOP|wxBOTTOM, 5 );
     }
     if (m_buttonFlags & wxPREVIEW_PREVIOUS)
     {
         m_previousPageButton = new wxButton( this, wxID_PREVIEW_PREVIOUS, _("<<"), wxDefaultPosition, wxSize(smallButtonWidth,-1), 0 );
         item0->Add( m_previousPageButton, 0, wxALIGN_CENTRE|wxRIGHT|wxTOP|wxBOTTOM, 5 );
     }

-    
+

     if (m_buttonFlags & wxPREVIEW_NEXT)
     {
         m_nextPageButton = new wxButton( this, wxID_PREVIEW_NEXT, _(">>"), wxDefaultPosition, wxSize(smallButtonWidth,-1), 0 );
         item0->Add( m_nextPageButton, 0, wxALIGN_CENTRE|wxRIGHT|wxTOP|wxBOTTOM, 5 );
     }
     if (m_buttonFlags & wxPREVIEW_NEXT)
     {
         m_nextPageButton = new wxButton( this, wxID_PREVIEW_NEXT, _(">>"), wxDefaultPosition, wxSize(smallButtonWidth,-1), 0 );
         item0->Add( m_nextPageButton, 0, wxALIGN_CENTRE|wxRIGHT|wxTOP|wxBOTTOM, 5 );
     }

-    
+

     if (m_buttonFlags & wxPREVIEW_LAST)
     {
         m_lastPageButton = new wxButton( this, wxID_PREVIEW_LAST, _(">>|"), wxDefaultPosition, wxSize(smallButtonWidth,-1), 0 );
         item0->Add( m_lastPageButton, 0, wxALIGN_CENTRE|wxRIGHT|wxTOP|wxBOTTOM, 5 );
     }
     if (m_buttonFlags & wxPREVIEW_LAST)
     {
         m_lastPageButton = new wxButton( this, wxID_PREVIEW_LAST, _(">>|"), wxDefaultPosition, wxSize(smallButtonWidth,-1), 0 );
         item0->Add( m_lastPageButton, 0, wxALIGN_CENTRE|wxRIGHT|wxTOP|wxBOTTOM, 5 );
     }

-    
+

     if (m_buttonFlags & wxPREVIEW_GOTO)
     {
         m_gotoPageButton = new wxButton( this, wxID_PREVIEW_GOTO, _("&Goto..."), wxDefaultPosition, wxDefaultSize, 0 );
         item0->Add( m_gotoPageButton, 0, wxALIGN_CENTRE|wxALL, 5 );
     }
     if (m_buttonFlags & wxPREVIEW_GOTO)
     {
         m_gotoPageButton = new wxButton( this, wxID_PREVIEW_GOTO, _("&Goto..."), wxDefaultPosition, wxDefaultSize, 0 );
         item0->Add( m_gotoPageButton, 0, wxALIGN_CENTRE|wxALL, 5 );
     }

-    
+

     if (m_buttonFlags & wxPREVIEW_ZOOM)
     {
     if (m_buttonFlags & wxPREVIEW_ZOOM)
     {

-        wxString choices[] = 
+        wxString choices[] =

         {
             wxT("10%"), wxT("15%"), wxT("20%"), wxT("25%"), wxT("30%"), wxT("35%"), wxT("40%"), wxT("45%"), wxT("50%"), wxT("55%"),
                 wxT("60%"), wxT("65%"), wxT("70%"), wxT("75%"), wxT("80%"), wxT("85%"), wxT("90%"), wxT("95%"), wxT("100%"), wxT("110%"),
                 wxT("120%"), wxT("150%"), wxT("200%")
         };
         int n = WXSIZEOF(choices);
         {
             wxT("10%"), wxT("15%"), wxT("20%"), wxT("25%"), wxT("30%"), wxT("35%"), wxT("40%"), wxT("45%"), wxT("50%"), wxT("55%"),
                 wxT("60%"), wxT("65%"), wxT("70%"), wxT("75%"), wxT("80%"), wxT("85%"), wxT("90%"), wxT("95%"), wxT("100%"), wxT("110%"),
                 wxT("120%"), wxT("150%"), wxT("200%")
         };
         int n = WXSIZEOF(choices);

-        
+

         m_zoomControl = new wxChoice( this, wxID_PREVIEW_ZOOM, wxDefaultPosition, wxSize(70,-1), n, choices, 0 );
         item0->Add( m_zoomControl, 0, wxALIGN_CENTRE|wxALL, 5 );
         SetZoomControl(m_printPreview->GetZoom());
         m_zoomControl = new wxChoice( this, wxID_PREVIEW_ZOOM, wxDefaultPosition, wxSize(70,-1), n, choices, 0 );
         item0->Add( m_zoomControl, 0, wxALIGN_CENTRE|wxALL, 5 );
         SetZoomControl(m_printPreview->GetZoom());


@@ -496,23 +500,34 @@ void wxPreviewControlBar::CreateButtons()
 
 void wxPreviewControlBar::SetZoomControl(int zoom)
 {
 
 void wxPreviewControlBar::SetZoomControl(int zoom)
 {

-    wxChar buf[20];
-    wxSprintf( buf, wxT("%d%%"), zoom );
-

     if (m_zoomControl)
     if (m_zoomControl)

-        m_zoomControl->SetStringSelection(buf);
+    {
+        int n, count = m_zoomControl->GetCount();
+        long val;
+        for (n=0; n<count; n++)
+        {
+            if (m_zoomControl->GetString(n).BeforeFirst(wxT('%')).ToLong(&val) &&
+                (val >= long(zoom)))
+            {
+                m_zoomControl->SetSelection(n);
+                return;
+            }
+        }
+        
+        m_zoomControl->SetSelection(count-1);
+    }

 }
 
 int wxPreviewControlBar::GetZoomControl()
 {
 }
 
 int wxPreviewControlBar::GetZoomControl()
 {

-    wxChar buf[20];
-    if (m_zoomControl && (m_zoomControl->GetStringSelection() != wxT("")))
+    if (m_zoomControl && (m_zoomControl->GetStringSelection() != wxEmptyString))

     {
     {

-        wxStrcpy(buf, m_zoomControl->GetStringSelection());
-        buf[wxStrlen(buf) - 1] = 0;
-        return (int)wxAtoi(buf);
+        long val;
+        if (m_zoomControl->GetStringSelection().BeforeFirst(wxT('%')).ToLong(&val))
+            return int(val);

     }
     }

-    else return 0;
+    
+    return 0;

 }
 
 
 }
 
 


@@ -537,7 +552,7 @@ wxFrame(parent, -1, title, pos, size, style, name)
     wxFrame* topFrame = wxDynamicCast(wxTheApp->GetTopWindow(), wxFrame);
     if (topFrame)
         SetIcon(topFrame->GetIcon());
     wxFrame* topFrame = wxDynamicCast(wxTheApp->GetTopWindow(), wxFrame);
     if (topFrame)
         SetIcon(topFrame->GetIcon());

-#endif    
+#endif

 }
 
 wxPreviewFrame::~wxPreviewFrame()
 }
 
 wxPreviewFrame::~wxPreviewFrame()


@@ -550,7 +565,7 @@ void wxPreviewFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
     // are multiple top-level windows.
 #ifndef __WXMAC__
     MakeModal(FALSE);
     // are multiple top-level windows.
 #ifndef __WXMAC__
     MakeModal(FALSE);

-#endif    
+#endif

 
     // Need to delete the printout and the print preview
     wxPrintout *printout = m_printPreview->GetPrintout();
 
     // Need to delete the printout and the print preview
     wxPrintout *printout = m_printPreview->GetPrintout();


@@ -592,7 +607,7 @@ void wxPreviewFrame::Initialize()
 #endif
 
     Layout();
 #endif
 
     Layout();

-    
+

     m_printPreview->AdjustScrollbars(m_previewCanvas);
     m_previewCanvas->SetFocus();
     m_controlBar->SetFocus();
     m_printPreview->AdjustScrollbars(m_previewCanvas);
     m_previewCanvas->SetFocus();
     m_controlBar->SetFocus();


@@ -682,11 +697,11 @@ bool wxPrintPreviewBase::SetCurrentPage(int pageNum)
         delete m_previewBitmap;
         m_previewBitmap = NULL;
     }
         delete m_previewBitmap;
         m_previewBitmap = NULL;
     }

-    
+

     if (m_previewCanvas)
     {
         AdjustScrollbars(m_previewCanvas);
     if (m_previewCanvas)
     {
         AdjustScrollbars(m_previewCanvas);

-        
+

         if (!RenderPage(pageNum))
             return FALSE;
         m_previewCanvas->Refresh();
         if (!RenderPage(pageNum))
             return FALSE;
         m_previewCanvas->Refresh();


@@ -751,7 +766,7 @@ void wxPrintPreviewBase::AdjustScrollbars(wxPreviewCanvas *canvas)
     int scrollUnitsY = totalHeight/10;
     wxSize virtualSize = canvas->GetVirtualSize();
     if (virtualSize.GetWidth() != totalWidth || virtualSize.GetHeight() != totalHeight)
     int scrollUnitsY = totalHeight/10;
     wxSize virtualSize = canvas->GetVirtualSize();
     if (virtualSize.GetWidth() != totalWidth || virtualSize.GetHeight() != totalHeight)

-        canvas->SetScrollbars(10, 10, scrollUnitsX, scrollUnitsY, 0, 0, TRUE);    
+        canvas->SetScrollbars(10, 10, scrollUnitsX, scrollUnitsY, 0, 0, TRUE);

 }
 
 bool wxPrintPreviewBase::RenderPage(int pageNum)
 }
 
 bool wxPrintPreviewBase::RenderPage(int pageNum)


@@ -772,12 +787,6 @@ bool wxPrintPreviewBase::RenderPage(int pageNum)
     int actualWidth = (int)(zoomScale*m_pageWidth*m_previewScale);
     int actualHeight = (int)(zoomScale*m_pageHeight*m_previewScale);
 
     int actualWidth = (int)(zoomScale*m_pageWidth*m_previewScale);
     int actualHeight = (int)(zoomScale*m_pageHeight*m_previewScale);
 

-    int x = (int)((canvasWidth - actualWidth)/2.0);
-    if (x < m_leftMargin)
-        x = m_leftMargin;
-    //  int y = m_topMargin;
-
-

     if (!m_previewBitmap)
     {
         m_previewBitmap = new wxBitmap((int)actualWidth, (int)actualHeight);
     if (!m_previewBitmap)
     {
         m_previewBitmap = new wxBitmap((int)actualWidth, (int)actualHeight);


@@ -902,7 +911,7 @@ void wxPrintPreviewBase::SetZoom(int percent)
         AdjustScrollbars(m_previewCanvas);
         RenderPage(m_currentPage);
         ((wxScrolledWindow *) m_previewCanvas)->Scroll(0, 0);
         AdjustScrollbars(m_previewCanvas);
         RenderPage(m_currentPage);
         ((wxScrolledWindow *) m_previewCanvas)->Scroll(0, 0);

-        m_previewCanvas->Clear();
+        m_previewCanvas->ClearBackground();

         m_previewCanvas->Refresh();
         m_previewCanvas->SetFocus();
     }
         m_previewCanvas->Refresh();
         m_previewCanvas->SetFocus();
     }