Fix for compilation error in Unicode mode

[wxWidgets.git] / src / generic / prntdlgg.cpp

diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp
index 47d3cfb3f1a9b86723ce7f8f8b2691b7fdcdd551..afdeb787258adc7eff20fb9b43abaa40b3dae8a3 100644 (file)
--- a/src/generic/prntdlgg.cpp
+++ b/src/generic/prntdlgg.cpp
@@ -28,8 +28,6 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/defs.h"
-

 #if wxUSE_PRINTING_ARCHITECTURE
 
 #ifndef WX_PRECOMP
 #if wxUSE_PRINTING_ARCHITECTURE
 
 #ifndef WX_PRECOMP


@@ -46,7 +44,7 @@
     #include "wx/filedlg.h"
     #include "wx/choice.h"
     #include "wx/combobox.h"
     #include "wx/filedlg.h"
     #include "wx/choice.h"
     #include "wx/combobox.h"

-    #include <wx/intl.h>
+    #include "wx/intl.h"

     #include "wx/sizer.h"
 #endif
 
     #include "wx/sizer.h"
 #endif
 


@@ -73,26 +71,25 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
 // wxWin macros
 // ----------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARY

 
 #if wxUSE_POSTSCRIPT
 
 
 #if wxUSE_POSTSCRIPT
 

-    IMPLEMENT_CLASS(wxGenericPrintDialog, wxDialog)
-    IMPLEMENT_CLASS(wxGenericPrintSetupDialog, wxDialog)
+IMPLEMENT_CLASS(wxGenericPrintDialog, wxDialog)
+IMPLEMENT_CLASS(wxGenericPrintSetupDialog, wxDialog)

 
 

-    BEGIN_EVENT_TABLE(wxGenericPrintDialog, wxDialog)
-        EVT_BUTTON(wxID_OK, wxGenericPrintDialog::OnOK)
-        EVT_BUTTON(wxPRINTID_SETUP, wxGenericPrintDialog::OnSetup)
-        EVT_RADIOBOX(wxPRINTID_RANGE, wxGenericPrintDialog::OnRange)
-    END_EVENT_TABLE()
-#endif
+BEGIN_EVENT_TABLE(wxGenericPrintDialog, wxDialog)
+    EVT_BUTTON(wxID_OK, wxGenericPrintDialog::OnOK)
+    EVT_BUTTON(wxPRINTID_SETUP, wxGenericPrintDialog::OnSetup)
+    EVT_RADIOBOX(wxPRINTID_RANGE, wxGenericPrintDialog::OnRange)
+END_EVENT_TABLE()

 
 

-    IMPLEMENT_CLASS(wxGenericPageSetupDialog, wxDialog)
+#endif // wxUSE_POSTSCRIPT

 
 

-    BEGIN_EVENT_TABLE(wxGenericPageSetupDialog, wxDialog)
-        EVT_BUTTON(wxPRINTID_SETUP, wxGenericPageSetupDialog::OnPrinter)
-    END_EVENT_TABLE()
-#endif // USE_SHARED_LIBRARY
+IMPLEMENT_CLASS(wxGenericPageSetupDialog, wxDialog)
+
+BEGIN_EVENT_TABLE(wxGenericPageSetupDialog, wxDialog)
+    EVT_BUTTON(wxPRINTID_SETUP, wxGenericPageSetupDialog::OnPrinter)
+END_EVENT_TABLE()

 
 // ----------------------------------------------------------------------------
 // global vars
 
 // ----------------------------------------------------------------------------
 // global vars


@@ -274,7 +271,7 @@ void wxGenericPrintDialog::OnOK(wxCommandEvent& WXUNUSED(event))
         wxString f = wxFileSelector(_("PostScript file"),
             wxPathOnly(wxThePrintSetupData->GetPrinterFile()),
             wxFileNameFromPath(wxThePrintSetupData->GetPrinterFile()),
         wxString f = wxFileSelector(_("PostScript file"),
             wxPathOnly(wxThePrintSetupData->GetPrinterFile()),
             wxFileNameFromPath(wxThePrintSetupData->GetPrinterFile()),

-            T("ps"), T("*.ps"), 0, this);
+            wxT("ps"), wxT("*.ps"), 0, this);

         if ( f.IsEmpty() )
             return;
 
         if ( f.IsEmpty() )
             return;
 


@@ -323,8 +320,6 @@ void wxGenericPrintDialog::OnSetup(wxCommandEvent& WXUNUSED(event))
 
 bool wxGenericPrintDialog::TransferDataToWindow()
 {
 
 bool wxGenericPrintDialog::TransferDataToWindow()
 {

-    char buf[10];
-

     if(m_printDialogData.GetFromPage() != 0)
     {
        if(m_fromText)
     if(m_printDialogData.GetFromPage() != 0)
     {
        if(m_fromText)


@@ -333,10 +328,10 @@ bool wxGenericPrintDialog::TransferDataToWindow()
           {
              m_fromText->Enable(TRUE);
              m_toText->Enable(TRUE);
           {
              m_fromText->Enable(TRUE);
              m_toText->Enable(TRUE);

-             sprintf(buf, "%d", m_printDialogData.GetFromPage());
-             m_fromText->SetValue(buf);
-             sprintf(buf, "%d", m_printDialogData.GetToPage());
-             m_toText->SetValue(buf);
+             m_fromText->SetValue(
+                 wxString::Format(_T("%d"), m_printDialogData.GetFromPage()));
+             m_toText->SetValue(
+                wxString::Format(_T("%d"), m_printDialogData.GetToPage()));

              if(m_rangeRadioBox)
                 if (m_printDialogData.GetAllPages())
                    m_rangeRadioBox->SetSelection(0);
              if(m_rangeRadioBox)
                 if (m_printDialogData.GetAllPages())
                    m_rangeRadioBox->SetSelection(0);


@@ -355,8 +350,8 @@ bool wxGenericPrintDialog::TransferDataToWindow()
           }
        }
     }
           }
        }
     }

-    sprintf(buf, "%d", m_printDialogData.GetNoCopies());
-    m_noCopiesText->SetValue(buf);
+    m_noCopiesText->SetValue(
+        wxString::Format(_T("%d"), m_printDialogData.GetNoCopies()));

 
     m_printToFileCheckBox->SetValue(m_printDialogData.GetPrintToFile());
     m_printToFileCheckBox->Enable(m_printDialogData.GetEnablePrintToFile());
 
     m_printToFileCheckBox->SetValue(m_printDialogData.GetPrintToFile());
     m_printToFileCheckBox->Enable(m_printDialogData.GetEnablePrintToFile());