wxWindow::Show() works again

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

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index 8ec6302cbda08658f10ee77ed3c1e1d98b3dc45b..1306c71e5bc61836e08420836206f5a2c34f7d57 100644 (file)
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -398,12 +398,12 @@ void wxPreviewControlBar::SetZoomControl(int zoom)
 
 int wxPreviewControlBar::GetZoomControl()
 {
 
 int wxPreviewControlBar::GetZoomControl()
 {

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

     {
     {

-        strcpy(buf, m_zoomControl->GetStringSelection());
-        buf[strlen(buf) - 1] = 0;
-        return (int)atoi(buf);
+        wxStrcpy(buf, m_zoomControl->GetStringSelection());
+        buf[wxStrlen(buf) - 1] = 0;
+        return (int)wxAtoi(buf);

     }
     else return 0;
 }
     }
     else return 0;
 }


@@ -430,7 +430,7 @@ wxPreviewFrame::~wxPreviewFrame()
 {
 }
 
 {
 }
 

-void wxPreviewFrame::OnCloseWindow(wxCloseEvent& event)
+void wxPreviewFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))

 {
     MakeModal(FALSE);
 
 {
     MakeModal(FALSE);
 


@@ -688,11 +688,11 @@ bool wxPrintPreviewBase::RenderPage(int pageNum)
 
     memoryDC.SelectObject(wxNullBitmap);
 
 
     memoryDC.SelectObject(wxNullBitmap);
 

-    char buf[200];
+    wxChar buf[200];

     if (m_maxPage != 0)
     if (m_maxPage != 0)

-        sprintf(buf, _("Page %d of %d"), pageNum, m_maxPage);
+        wxSprintf(buf, _("Page %d of %d"), pageNum, m_maxPage);

     else
     else

-        sprintf(buf, _("Page %d"), pageNum);
+        wxSprintf(buf, _("Page %d"), pageNum);

 
     if (m_previewFrame)
         m_previewFrame->SetStatusText(buf);
 
     if (m_previewFrame)
         m_previewFrame->SetStatusText(buf);


@@ -752,10 +752,11 @@ void wxPrintPreviewBase::SetZoom(int percent)
         delete m_previewBitmap;
         m_previewBitmap = NULL;
     }
         delete m_previewBitmap;
         m_previewBitmap = NULL;
     }

-    RenderPage(m_currentPage);
+

 
     if (m_previewCanvas)
     {
 
     if (m_previewCanvas)
     {

+        RenderPage(m_currentPage);

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