Applied patch [ 662321 ] Port of wxWindows to Wine

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

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index c1a6732be559ddfbb58bee9b45810aa620feea0f..34cfe0b5a1b8587d354657468c6a90c7f320e415 100644 (file)
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:       wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -36,7 +36,9 @@
 #include "wx/dcmemory.h"
 #include "wx/stattext.h"
 #include "wx/intl.h"
 #include "wx/dcmemory.h"
 #include "wx/stattext.h"
 #include "wx/intl.h"

-#endif
+#include "wx/textdlg.h"
+#include "wx/sizer.h"
+#endif // !WX_PRECOMP

 
 #include "wx/prntbase.h"
 #include "wx/dcprint.h"
 
 #include "wx/prntbase.h"
 #include "wx/dcprint.h"


@@ -46,8 +48,6 @@
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 

-#include <wx/sizer.h>
-                                         

 #ifdef __WXMSW__
     #include "wx/msw/private.h"
     #include <commdlg.h>
 #ifdef __WXMSW__
     #include "wx/msw/private.h"
     #include <commdlg.h>


@@ -285,7 +285,7 @@ void wxPreviewControlBar::OnPrint(wxCommandEvent& WXUNUSED(event))
 
 void wxPreviewControlBar::OnChar(wxKeyEvent &event)
 {
 
 void wxPreviewControlBar::OnChar(wxKeyEvent &event)
 {

-   switch(event.KeyCode())
+   switch(event.GetKeyCode())

    {
    case WXK_NEXT:
       OnNext(); break;
    {
    case WXK_NEXT:
       OnNext(); break;


@@ -370,9 +370,9 @@ void wxPreviewControlBar::OnGoto(void)
             wxString strPrompt;
             wxString strPage;
 
             wxString strPrompt;
             wxString strPage;
 

-            strPrompt.Printf( _("%d...%d"),
+            strPrompt.Printf( wxT("%d...%d"),

                 preview->GetMinPage(), preview->GetMaxPage());
                 preview->GetMinPage(), preview->GetMaxPage());

-            strPage.Printf( _("%d"), preview->GetCurrentPage() );
+            strPage.Printf( wxT("%d"), preview->GetCurrentPage() );

 
             strPage =
                 wxGetTextFromUser( strPrompt, _("Goto Page"), strPage);
 
             strPage =
                 wxGetTextFromUser( strPrompt, _("Goto Page"), strPage);


@@ -474,11 +474,11 @@ void wxPreviewControlBar::CreateButtons()
 
     if (m_buttonFlags & wxPREVIEW_ZOOM)
     {
 
     if (m_buttonFlags & wxPREVIEW_ZOOM)
     {

-        static const char *choices[] =
+        static const wxChar *choices[] =

         {
         {

-            "10%", "15%", "20%", "25%", "30%", "35%", "40%", "45%", "50%", "55%",
-            "60%", "65%", "70%", "75%", "80%", "85%", "90%", "95%", "100%", "110%",
-            "120%", "150%", "200%"
+            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);
         };
 
         int n = WXSIZEOF(choices);


@@ -504,9 +504,9 @@ void wxPreviewControlBar::CreateButtons()
 
 void wxPreviewControlBar::SetZoomControl(int zoom)
 {
 
 void wxPreviewControlBar::SetZoomControl(int zoom)
 {

-    char buf[20];
-    sprintf(buf, "%d%%", zoom);
-// Someone is calling methods that do no exist in wxChoice!! So I'll just comment out for VA for now
+    wxChar buf[20];
+    wxSprintf( buf, wxT("%d%%"), zoom );
+

     if (m_zoomControl)
         m_zoomControl->SetStringSelection(buf);
 }
     if (m_zoomControl)
         m_zoomControl->SetStringSelection(buf);
 }