Corrected byte swapping macros.

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

diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp
index de944fc343fccc7f5b1f4fe150b963f6430d315a..526a4df7a6a5ce980c90cd26655b9d2ebc35a288 100644 (file)
--- a/src/generic/prntdlgg.cpp
+++ b/src/generic/prntdlgg.cpp
@@ -65,18 +65,21 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
 // wxWin macros
 // ----------------------------------------------------------------------------
 

+#if !USE_SHARED_LIBRARY
+

 #if wxUSE_POSTSCRIPT
 
 #if wxUSE_POSTSCRIPT
 

-#if !USE_SHARED_LIBRARY

     IMPLEMENT_CLASS(wxGenericPrintDialog, wxDialog)
     IMPLEMENT_CLASS(wxGenericPrintSetupDialog, wxDialog)
     IMPLEMENT_CLASS(wxGenericPrintDialog, wxDialog)
     IMPLEMENT_CLASS(wxGenericPrintSetupDialog, wxDialog)

-    IMPLEMENT_CLASS(wxGenericPageSetupDialog, 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()
 
     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
+
+    IMPLEMENT_CLASS(wxGenericPageSetupDialog, wxDialog)

 
     BEGIN_EVENT_TABLE(wxGenericPageSetupDialog, wxDialog)
         EVT_BUTTON(wxPRINTID_SETUP, wxGenericPageSetupDialog::OnPrinter)
 
     BEGIN_EVENT_TABLE(wxGenericPageSetupDialog, wxDialog)
         EVT_BUTTON(wxPRINTID_SETUP, wxGenericPageSetupDialog::OnPrinter)


@@ -89,6 +92,8 @@
 
 extern wxPrintPaperDatabase *wxThePrintPaperDatabase;
 
 
 extern wxPrintPaperDatabase *wxThePrintPaperDatabase;
 

+#if wxUSE_POSTSCRIPT
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -125,7 +130,7 @@ wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
     Init(parent);
 }
 
     Init(parent);
 }
 

-void wxGenericPrintDialog::Init(wxWindow *parent)
+void wxGenericPrintDialog::Init(wxWindow * WXUNUSED(parent))

 {
   //    wxDialog::Create(parent, -1, _("Print"), wxPoint(0, 0), wxSize(600, 600),
   //                     wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL | wxTAB_TRAVERSAL);
 {
   //    wxDialog::Create(parent, -1, _("Print"), wxPoint(0, 0), wxSize(600, 600),
   //                     wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL | wxTAB_TRAVERSAL);


@@ -268,6 +273,7 @@ void wxGenericPrintDialog::OnRange(wxCommandEvent& event)
 
 void wxGenericPrintDialog::OnSetup(wxCommandEvent& WXUNUSED(event))
 {
 
 void wxGenericPrintDialog::OnSetup(wxCommandEvent& WXUNUSED(event))
 {

+   *wxThePrintSetupData = m_printDialogData.GetPrintData();

     wxGenericPrintSetupDialog *genericPrintSetupDialog =
         new wxGenericPrintSetupDialog(this, wxThePrintSetupData);
     int ret = genericPrintSetupDialog->ShowModal();
     wxGenericPrintSetupDialog *genericPrintSetupDialog =
         new wxGenericPrintSetupDialog(this, wxThePrintSetupData);
     int ret = genericPrintSetupDialog->ShowModal();