extracted wxFrame::MSWTranslateMessage() implementation into new MSWDoTranslateMessag...

[wxWidgets.git] / src / msw / printdlg.cpp

diff --git a/src/msw/printdlg.cpp b/src/msw/printdlg.cpp
index 6a5a7e4fd552474b95725551c738538fe2569109..33e9028994c5f783b0fdbabe4e85b822e39cbfbf 100644 (file)
--- a/src/msw/printdlg.cpp
+++ b/src/msw/printdlg.cpp
@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "printdlg.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -38,14 +34,13 @@
 
 #include "wx/cmndata.h"
 #include "wx/printdlg.h"
 
 #include "wx/cmndata.h"
 #include "wx/printdlg.h"

+#include "wx/msw/printdlg.h"

 #include "wx/dcprint.h"
 #include "wx/paper.h"
 
 #include <stdlib.h>
 
 #include "wx/dcprint.h"
 #include "wx/paper.h"
 
 #include <stdlib.h>
 

-#include "wx/msw/private.h"
-
-#include <commdlg.h>
+#include "wx/msw/wrapcdlg.h"

 
 #ifndef __WIN32__
     #include <print.h>
 
 #ifndef __WIN32__
     #include <print.h>


@@ -93,8 +88,8 @@ static wxString wxGetPrintDlgError()
 static HGLOBAL wxCreateDevNames(const wxString& driverName, const wxString& printerName, const wxString& portName)
 {
     HGLOBAL hDev = NULL;
 static HGLOBAL wxCreateDevNames(const wxString& driverName, const wxString& printerName, const wxString& portName)
 {
     HGLOBAL hDev = NULL;

-    // if (!driverName.IsEmpty() && !printerName.IsEmpty() && !portName.IsEmpty())
-    if (driverName.IsEmpty() && printerName.IsEmpty() && portName.IsEmpty())
+    // if (!driverName.empty() && !printerName.empty() && !portName.empty())
+    if (driverName.empty() && printerName.empty() && portName.empty())

     {
     }
     else
     {
     }
     else


@@ -129,6 +124,7 @@ wxWindowsPrintNativeData::wxWindowsPrintNativeData()
 {
     m_devMode = (void*) NULL;
     m_devNames = (void*) NULL;
 {
     m_devMode = (void*) NULL;
     m_devNames = (void*) NULL;

+    m_customWindowsPaperId = 0;

 }
 
 wxWindowsPrintNativeData::~wxWindowsPrintNativeData()
 }
 
 wxWindowsPrintNativeData::~wxWindowsPrintNativeData()


@@ -152,9 +148,10 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data )
     HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames;
 
     if (!hDevMode)
     HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames;
 
     if (!hDevMode)

+    {

         return false;
         return false;

-
-    if ( hDevMode )
+    }
+    else

     {
         LPDEVMODE devMode = (LPDEVMODE)GlobalLock(hDevMode);
 
     {
         LPDEVMODE devMode = (LPDEVMODE)GlobalLock(hDevMode);
 


@@ -175,12 +172,38 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data )
         if (devMode->dmFields & DM_COPIES)
             data.SetNoCopies( devMode->dmCopies );
 
         if (devMode->dmFields & DM_COPIES)
             data.SetNoCopies( devMode->dmCopies );
 

-        if (devMode->dmFields & DM_DEFAULTSOURCE)
-            data.SetBin( (wxPrintBin)devMode->dmDefaultSource );
+        //// Bin
+        if (devMode->dmFields & DM_DEFAULTSOURCE) {
+            switch (devMode->dmDefaultSource) {
+                case DMBIN_ONLYONE        : data.SetBin(wxPRINTBIN_ONLYONE       ); break;
+                case DMBIN_LOWER          : data.SetBin(wxPRINTBIN_LOWER         ); break;
+                case DMBIN_MIDDLE         : data.SetBin(wxPRINTBIN_MIDDLE        ); break;
+                case DMBIN_MANUAL         : data.SetBin(wxPRINTBIN_MANUAL        ); break;
+                case DMBIN_ENVELOPE       : data.SetBin(wxPRINTBIN_ENVELOPE      ); break;
+                case DMBIN_ENVMANUAL      : data.SetBin(wxPRINTBIN_ENVMANUAL     ); break;
+                case DMBIN_AUTO           : data.SetBin(wxPRINTBIN_AUTO          ); break;
+                case DMBIN_TRACTOR        : data.SetBin(wxPRINTBIN_TRACTOR       ); break;
+                case DMBIN_SMALLFMT       : data.SetBin(wxPRINTBIN_SMALLFMT      ); break;
+                case DMBIN_LARGEFMT       : data.SetBin(wxPRINTBIN_LARGEFMT      ); break;
+                case DMBIN_LARGECAPACITY  : data.SetBin(wxPRINTBIN_LARGECAPACITY ); break;
+                case DMBIN_CASSETTE       : data.SetBin(wxPRINTBIN_CASSETTE      ); break;
+                case DMBIN_FORMSOURCE     : data.SetBin(wxPRINTBIN_FORMSOURCE    ); break;
+                default:
+                    if (devMode->dmDefaultSource>=DMBIN_USER) {
+                        data.SetBin((wxPrintBin)((devMode->dmDefaultSource)-DMBIN_USER+(int)wxPRINTBIN_USER));
+                    } else {
+                        data.SetBin(wxPRINTBIN_DEFAULT);
+                    }
+                    break;
+            }
+        } else {
+            data.SetBin(wxPRINTBIN_DEFAULT);
+        }

 
         //// Printer name
         if (devMode->dmDeviceName[0] != 0)
 
         //// Printer name
         if (devMode->dmDeviceName[0] != 0)

-            data.SetPrinterName( devMode->dmDeviceName );
+            // This syntax fixes a crash when using VS 7.1
+            data.SetPrinterName( wxString(devMode->dmDeviceName, CCHDEVICENAME) );

 
         //// Colour
         if (devMode->dmFields & DM_COLOR)
 
         //// Colour
         if (devMode->dmFields & DM_COLOR)


@@ -199,6 +222,8 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data )
         // set both DM_PAPERSIZE and DM_PAPERWIDTH & DM_PAPERLENGTH. Since
         // dmPaperSize >= DMPAPER_USER wouldn't be in wxWin's database, this
         // code wouldn't set m_paperSize correctly.
         // set both DM_PAPERSIZE and DM_PAPERWIDTH & DM_PAPERLENGTH. Since
         // dmPaperSize >= DMPAPER_USER wouldn't be in wxWin's database, this
         // code wouldn't set m_paperSize correctly.

+
+        bool foundPaperSize = false;

         if ((devMode->dmFields & DM_PAPERSIZE) && (devMode->dmPaperSize < DMPAPER_USER))
         {
             if (wxThePrintPaperDatabase)
         if ((devMode->dmFields & DM_PAPERSIZE) && (devMode->dmPaperSize < DMPAPER_USER))
         {
             if (wxThePrintPaperDatabase)


@@ -208,13 +233,8 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data )
                 {
                     data.SetPaperId( paper->GetId() );
                     data.SetPaperSize( wxSize(paper->GetWidth() / 10,paper->GetHeight() / 10) );
                 {
                     data.SetPaperId( paper->GetId() );
                     data.SetPaperSize( wxSize(paper->GetWidth() / 10,paper->GetHeight() / 10) );

-                }
-                else
-                {
-                    // Shouldn't really get here
-                    wxFAIL_MSG(wxT("Couldn't find paper size in paper database."));
-                    data.SetPaperId( wxPAPER_NONE );
-                    data.SetPaperSize( wxSize(0,0) );
+                    m_customWindowsPaperId = 0;
+                    foundPaperSize = true;

                 }
             }
             else
                 }
             }
             else


@@ -223,20 +243,31 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data )
                 wxFAIL_MSG(wxT("Paper database wasn't initialized in wxPrintData::ConvertFromNative."));
                 data.SetPaperId( wxPAPER_NONE );
                 data.SetPaperSize( wxSize(0,0) );
                 wxFAIL_MSG(wxT("Paper database wasn't initialized in wxPrintData::ConvertFromNative."));
                 data.SetPaperId( wxPAPER_NONE );
                 data.SetPaperSize( wxSize(0,0) );

+                m_customWindowsPaperId = 0;
+
+                GlobalUnlock(hDevMode);
+                return false;

             }
         }
             }
         }

-        else if ((devMode->dmFields & DM_PAPERWIDTH) && (devMode->dmFields & DM_PAPERLENGTH))
-        {
-            // DEVMODE is in tenths of a milimeter
-            data.SetPaperId( wxPAPER_NONE );
-            data.SetPaperSize( wxSize(devMode->dmPaperWidth / 10, devMode->dmPaperLength / 10) );
-        }
-        else
-        {
-            // Shouldn't really get here
-            wxFAIL_MSG(wxT("Couldn't find paper size from DEVMODE."));
-            data.SetPaperId( wxPAPER_NONE );
-            data.SetPaperSize( wxSize(0,0) );
+
+        if (!foundPaperSize) {
+            if ((devMode->dmFields & DM_PAPERWIDTH) && (devMode->dmFields & DM_PAPERLENGTH))
+            {
+                // DEVMODE is in tenths of a millimeter
+                data.SetPaperSize( wxSize(devMode->dmPaperWidth / 10, devMode->dmPaperLength / 10) );
+                data.SetPaperId( wxPAPER_NONE );
+                m_customWindowsPaperId = devMode->dmPaperSize;
+            }
+            else
+            {
+                // Often will reach this for non-standard paper sizes (sizes which
+                // wouldn't be in wxWidget's paper database). Setting
+                // m_customWindowsPaperId to devMode->dmPaperSize should be enough
+                // to get this paper size working.
+                data.SetPaperSize( wxSize(0,0) );
+                data.SetPaperId( wxPAPER_NONE );
+                m_customWindowsPaperId = devMode->dmPaperSize;
+            }

         }
 
         //// Duplex
         }
 
         //// Duplex


@@ -247,7 +278,7 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data )
             {
                 case DMDUP_HORIZONTAL:   data.SetDuplex( wxDUPLEX_HORIZONTAL ); break;
                 case DMDUP_VERTICAL:     data.SetDuplex( wxDUPLEX_VERTICAL ); break;
             {
                 case DMDUP_HORIZONTAL:   data.SetDuplex( wxDUPLEX_HORIZONTAL ); break;
                 case DMDUP_VERTICAL:     data.SetDuplex( wxDUPLEX_VERTICAL ); break;

-                default:    
+                default:

                 case DMDUP_SIMPLEX:      data.SetDuplex( wxDUPLEX_SIMPLEX ); break;
             }
         }
                 case DMDUP_SIMPLEX:      data.SetDuplex( wxDUPLEX_SIMPLEX ); break;
             }
         }


@@ -278,6 +309,11 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data )
         else
             data.SetQuality( wxPRINT_QUALITY_HIGH );
 
         else
             data.SetQuality( wxPRINT_QUALITY_HIGH );
 

+        if (devMode->dmDriverExtra > 0)
+            data.SetPrivData( (char *)devMode+devMode->dmSize, devMode->dmDriverExtra );
+        else
+            data.SetPrivData( NULL, 0 );
+

         GlobalUnlock(hDevMode);
     }
 
         GlobalUnlock(hDevMode);
     }
 


@@ -296,15 +332,15 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data )
             wxString printerName = (LPTSTR)lpDevNames + lpDevNames->wDeviceOffset;
 
             // Not sure if we should check for this mismatch
             wxString printerName = (LPTSTR)lpDevNames + lpDevNames->wDeviceOffset;
 
             // Not sure if we should check for this mismatch

-//            wxASSERT_MSG( (m_printerName == "" || (devName == m_printerName)), "Printer name obtained from DEVMODE and DEVNAMES were different!");
+//            wxASSERT_MSG( (m_printerName.empty() || (devName == m_printerName)), "Printer name obtained from DEVMODE and DEVNAMES were different!");

 
 

-            if (printerName != wxT(""))
+            if (!printerName.empty())

                 data.SetPrinterName( printerName );
 
             GlobalUnlock(hDevNames);
         }
     }
                 data.SetPrinterName( printerName );
 
             GlobalUnlock(hDevNames);
         }
     }

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -390,7 +426,7 @@ bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data )
 
         //// Printer name
         wxString name = data.GetPrinterName();
 
         //// Printer name
         wxString name = data.GetPrinterName();

-        if (name != wxT(""))
+        if (!name.empty())

         {
             //int len = wxMin(31, m_printerName.Len());
             wxStrncpy((wxChar*)devMode->dmDeviceName,name.c_str(),31);
         {
             //int len = wxMin(31, m_printerName.Len());
             wxStrncpy((wxChar*)devMode->dmDeviceName,name.c_str(),31);


@@ -410,7 +446,10 @@ bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data )
             // DEVMODE is in tenths of a milimeter
             devMode->dmPaperWidth = (short)(data.GetPaperSize().x * 10);
             devMode->dmPaperLength = (short)(data.GetPaperSize().y * 10);
             // DEVMODE is in tenths of a milimeter
             devMode->dmPaperWidth = (short)(data.GetPaperSize().x * 10);
             devMode->dmPaperLength = (short)(data.GetPaperSize().y * 10);

-            devMode->dmPaperSize = DMPAPER_USER;
+            if(m_customWindowsPaperId != 0)
+                devMode->dmPaperSize = m_customWindowsPaperId;
+            else
+                devMode->dmPaperSize = DMPAPER_USER;

             devMode->dmFields |= DM_PAPERWIDTH;
             devMode->dmFields |= DM_PAPERLENGTH;
         }
             devMode->dmFields |= DM_PAPERWIDTH;
             devMode->dmFields |= DM_PAPERLENGTH;
         }


@@ -424,6 +463,15 @@ bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data )
                     devMode->dmPaperSize = (short)paper->GetPlatformId();
                     devMode->dmFields |= DM_PAPERSIZE;
                 }
                     devMode->dmPaperSize = (short)paper->GetPlatformId();
                     devMode->dmFields |= DM_PAPERSIZE;
                 }

+                else
+                {
+                    // Fall back on specifying the paper size explicitly
+                    devMode->dmPaperWidth = (short)(data.GetPaperSize().x * 10);
+                    devMode->dmPaperLength = (short)(data.GetPaperSize().y * 10);
+                    devMode->dmPaperSize = DMPAPER_USER;
+                    devMode->dmFields |= DM_PAPERWIDTH;
+                    devMode->dmFields |= DM_PAPERLENGTH;
+                }

             }
         }
 
             }
         }
 


@@ -469,6 +517,12 @@ bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data )
         devMode->dmPrintQuality = quality;
         devMode->dmFields |= DM_PRINTQUALITY;
 
         devMode->dmPrintQuality = quality;
         devMode->dmFields |= DM_PRINTQUALITY;
 

+        if (data.GetPrivDataLen() > 0)
+        {
+            memcpy( (char *)devMode+devMode->dmSize, data.GetPrivData(), data.GetPrivDataLen() );
+            devMode->dmDriverExtra = (WXWORD)data.GetPrivDataLen();
+        }
+

         if (data.GetBin() != wxPRINTBIN_DEFAULT)
         {
             switch (data.GetBin())
         if (data.GetBin() != wxPRINTBIN_DEFAULT)
         {
             switch (data.GetBin())


@@ -488,7 +542,7 @@ bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data )
                 case wxPRINTBIN_FORMSOURCE:     devMode->dmDefaultSource = DMBIN_FORMSOURCE;    break;
 
                 default:
                 case wxPRINTBIN_FORMSOURCE:     devMode->dmDefaultSource = DMBIN_FORMSOURCE;    break;
 
                 default:

-                    devMode->dmDefaultSource = (short)(DMBIN_USER + data.GetBin() - wxPRINTBIN_USER);
+                    devMode->dmDefaultSource = (short)(DMBIN_USER + data.GetBin() - wxPRINTBIN_USER); // 256 + data.GetBin() - 14 = 242 + data.GetBin()

                     break;
             }
 
                     break;
             }
 


@@ -504,11 +558,11 @@ bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data )
     }
 
     // TODO: I hope it's OK to pass some empty strings to DEVNAMES.
     }
 
     // TODO: I hope it's OK to pass some empty strings to DEVNAMES.

-    m_devNames = (void*) (long) wxCreateDevNames(wxT(""), data.GetPrinterName(), wxT(""));
-    
+    m_devNames = (void*) (long) wxCreateDevNames(wxEmptyString, data.GetPrinterName(), wxEmptyString);
+

     return true;
 }
     return true;
 }

-    
+

 // ---------------------------------------------------------------------------
 // wxPrintDialog
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // wxPrintDialog
 // ---------------------------------------------------------------------------


@@ -537,7 +591,7 @@ bool wxWindowsPrintDialog::Create(wxWindow *p, wxPrintDialogData* data)
 
     // MSW handle
     m_printDlg = NULL;
 
     // MSW handle
     m_printDlg = NULL;

-    
+

     if ( data )
         m_printDialogData = *data;
 
     if ( data )
         m_printDialogData = *data;
 


@@ -561,7 +615,7 @@ int wxWindowsPrintDialog::ShowModal()
     ConvertToNative( m_printDialogData );
 
     PRINTDLG *pd = (PRINTDLG*) m_printDlg;
     ConvertToNative( m_printDialogData );
 
     PRINTDLG *pd = (PRINTDLG*) m_printDlg;

-    
+

     if (m_dialogParent)
         pd->hwndOwner = (HWND) m_dialogParent->GetHWND();
     else if (wxTheApp->GetTopWindow())
     if (m_dialogParent)
         pd->hwndOwner = (HWND) m_dialogParent->GetHWND();
     else if (wxTheApp->GetTopWindow())


@@ -573,7 +627,7 @@ int wxWindowsPrintDialog::ShowModal()
 
     pd->hwndOwner = 0;
 
 
     pd->hwndOwner = 0;
 

-    if ( ret != false && (pd->hDC) )
+    if ( ret && (pd->hDC) )

     {
         wxPrinterDC *pdc = new wxPrinterDC( (WXHDC) pd->hDC );
         m_printerDC = pdc;
     {
         wxPrinterDC *pdc = new wxPrinterDC( (WXHDC) pd->hDC );
         m_printerDC = pdc;


@@ -602,13 +656,13 @@ bool wxWindowsPrintDialog::ConvertToNative( wxPrintDialogData &data )
     wxWindowsPrintNativeData *native_data =
         (wxWindowsPrintNativeData *) data.GetPrintData().GetNativeData();
     data.GetPrintData().ConvertToNative();
     wxWindowsPrintNativeData *native_data =
         (wxWindowsPrintNativeData *) data.GetPrintData().GetNativeData();
     data.GetPrintData().ConvertToNative();

-    
+

     PRINTDLG *pd = (PRINTDLG*) m_printDlg;
 
     // Shouldn't have been defined anywhere
     if (pd)
         return false;
     PRINTDLG *pd = (PRINTDLG*) m_printDlg;
 
     // Shouldn't have been defined anywhere
     if (pd)
         return false;

-    
+

     pd = new PRINTDLG;
     memset( pd, 0, sizeof(PRINTDLG) );
     m_printDlg = (void*) pd;
     pd = new PRINTDLG;
     memset( pd, 0, sizeof(PRINTDLG) );
     m_printDlg = (void*) pd;


@@ -625,7 +679,7 @@ bool wxWindowsPrintDialog::ConvertToNative( wxPrintDialogData &data )
 
     pd->Flags          = PD_RETURNDEFAULT;
     pd->nCopies        = 1;
 
     pd->Flags          = PD_RETURNDEFAULT;
     pd->nCopies        = 1;

-    
+

     // Pass the devmode data to the PRINTDLG structure, since it'll
     // be needed when PrintDlg is called.
     if (pd->hDevMode)
     // Pass the devmode data to the PRINTDLG structure, since it'll
     // be needed when PrintDlg is called.
     if (pd->hDevMode)


@@ -694,7 +748,7 @@ bool wxWindowsPrintDialog::ConvertToNative( wxPrintDialogData &data )
     if ( data.GetSetupDialog() )
         pd->Flags |= PD_PRINTSETUP;
 #endif
     if ( data.GetSetupDialog() )
         pd->Flags |= PD_PRINTSETUP;
 #endif

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -706,7 +760,7 @@ bool wxWindowsPrintDialog::ConvertFromNative( wxPrintDialogData &data )
 
     wxWindowsPrintNativeData *native_data =
         (wxWindowsPrintNativeData *) data.GetPrintData().GetNativeData();
 
     wxWindowsPrintNativeData *native_data =
         (wxWindowsPrintNativeData *) data.GetPrintData().GetNativeData();

-    
+

     // Pass the devmode data back to the wxPrintData structure where it really belongs.
     if (pd->hDevMode)
     {
     // Pass the devmode data back to the wxPrintData structure where it really belongs.
     if (pd->hDevMode)
     {


@@ -751,28 +805,28 @@ bool wxWindowsPrintDialog::ConvertFromNative( wxPrintDialogData &data )
     data.EnableHelp( ((pd->Flags & PD_SHOWHELP) == PD_SHOWHELP) );
 #if WXWIN_COMPATIBILITY_2_4
     data.SetSetupDialog( ((pd->Flags & PD_PRINTSETUP) == PD_PRINTSETUP) );
     data.EnableHelp( ((pd->Flags & PD_SHOWHELP) == PD_SHOWHELP) );
 #if WXWIN_COMPATIBILITY_2_4
     data.SetSetupDialog( ((pd->Flags & PD_PRINTSETUP) == PD_PRINTSETUP) );

-#endif    
+#endif

     return true;
 }
 
 // ---------------------------------------------------------------------------
     return true;
 }
 
 // ---------------------------------------------------------------------------

-// wxPageSetupDialog
+// wxWidnowsPageSetupDialog

 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 

-IMPLEMENT_CLASS(wxPageSetupDialog, wxDialog)
+IMPLEMENT_CLASS(wxWindowsPageSetupDialog, wxPageSetupDialogBase)

 
 

-wxPageSetupDialog::wxPageSetupDialog()
+wxWindowsPageSetupDialog::wxWindowsPageSetupDialog()

 {
     m_dialogParent = NULL;
     m_pageDlg = NULL;
 }
 
 {
     m_dialogParent = NULL;
     m_pageDlg = NULL;
 }
 

-wxPageSetupDialog::wxPageSetupDialog(wxWindow *p, wxPageSetupDialogData *data)
+wxWindowsPageSetupDialog::wxWindowsPageSetupDialog(wxWindow *p, wxPageSetupDialogData *data)

 {
     Create(p, data);
 }
 
 {
     Create(p, data);
 }
 

-bool wxPageSetupDialog::Create(wxWindow *p, wxPageSetupDialogData *data)
+bool wxWindowsPageSetupDialog::Create(wxWindow *p, wxPageSetupDialogData *data)

 {
     m_dialogParent = p;
     m_pageDlg = NULL;
 {
     m_dialogParent = p;
     m_pageDlg = NULL;


@@ -783,7 +837,7 @@ bool wxPageSetupDialog::Create(wxWindow *p, wxPageSetupDialogData *data)
     return true;
 }
 
     return true;
 }
 

-wxPageSetupDialog::~wxPageSetupDialog()
+wxWindowsPageSetupDialog::~wxWindowsPageSetupDialog()

 {
     PAGESETUPDLG *pd = (PAGESETUPDLG *)m_pageDlg;
     if ( pd && pd->hDevMode )
 {
     PAGESETUPDLG *pd = (PAGESETUPDLG *)m_pageDlg;
     if ( pd && pd->hDevMode )


@@ -794,10 +848,10 @@ wxPageSetupDialog::~wxPageSetupDialog()
         delete pd;
 }
 
         delete pd;
 }
 

-int wxPageSetupDialog::ShowModal()
+int wxWindowsPageSetupDialog::ShowModal()

 {
     ConvertToNative( m_pageSetupData );
 {
     ConvertToNative( m_pageSetupData );

-    
+

     PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageDlg;
     if (m_dialogParent)
         pd->hwndOwner = (HWND) m_dialogParent->GetHWND();
     PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageDlg;
     if (m_dialogParent)
         pd->hwndOwner = (HWND) m_dialogParent->GetHWND();


@@ -816,7 +870,7 @@ int wxPageSetupDialog::ShowModal()
         return wxID_CANCEL;
 }
 
         return wxID_CANCEL;
 }
 

-bool wxPageSetupDialog::ConvertToNative( wxPageSetupDialogData &data )
+bool wxWindowsPageSetupDialog::ConvertToNative( wxPageSetupDialogData &data )

 {
     wxWindowsPrintNativeData *native_data =
         (wxWindowsPrintNativeData *) data.GetPrintData().GetNativeData();
 {
     wxWindowsPrintNativeData *native_data =
         (wxWindowsPrintNativeData *) data.GetPrintData().GetNativeData();


@@ -827,7 +881,7 @@ bool wxPageSetupDialog::ConvertToNative( wxPageSetupDialogData &data )
     // Shouldn't have been defined anywhere
     if (pd)
         return false;
     // Shouldn't have been defined anywhere
     if (pd)
         return false;

-        
+

     pd = new PAGESETUPDLG;
     pd->hDevMode = NULL;
     pd->hDevNames = NULL;
     pd = new PAGESETUPDLG;
     pd->hDevMode = NULL;
     pd->hDevNames = NULL;


@@ -920,7 +974,7 @@ bool wxPageSetupDialog::ConvertToNative( wxPageSetupDialogData &data )
     return true;
 }
 
     return true;
 }
 

-bool wxPageSetupDialog::ConvertFromNative( wxPageSetupDialogData &data )
+bool wxWindowsPageSetupDialog::ConvertFromNative( wxPageSetupDialogData &data )

 {
     PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageDlg;
     if ( !pd )
 {
     PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageDlg;
     if ( !pd )


@@ -928,7 +982,7 @@ bool wxPageSetupDialog::ConvertFromNative( wxPageSetupDialogData &data )
 
     wxWindowsPrintNativeData *native_data =
         (wxWindowsPrintNativeData *) data.GetPrintData().GetNativeData();
 
     wxWindowsPrintNativeData *native_data =
         (wxWindowsPrintNativeData *) data.GetPrintData().GetNativeData();

-        
+

     // Pass the devmode data back to the wxPrintData structure where it really belongs.
     if (pd->hDevMode)
     {
     // Pass the devmode data back to the wxPrintData structure where it really belongs.
     if (pd->hDevMode)
     {


@@ -940,7 +994,7 @@ bool wxPageSetupDialog::ConvertFromNative( wxPageSetupDialogData &data )
         native_data->SetDevMode( (void*) pd->hDevMode );
         pd->hDevMode = NULL;
     }
         native_data->SetDevMode( (void*) pd->hDevMode );
         pd->hDevMode = NULL;
     }

-    
+

     // Isn't this superfluous? It's called again below.
     // data.GetPrintData().ConvertFromNative();
 
     // Isn't this superfluous? It's called again below.
     // data.GetPrintData().ConvertFromNative();
 


@@ -976,7 +1030,7 @@ bool wxPageSetupDialog::ConvertFromNative( wxPageSetupDialogData &data )
 
     data.SetMarginTopLeft( wxPoint(pd->rtMargin.left / 100, pd->rtMargin.top / 100) );
     data.SetMarginBottomRight( wxPoint(pd->rtMargin.right / 100, pd->rtMargin.bottom / 100) );
 
     data.SetMarginTopLeft( wxPoint(pd->rtMargin.left / 100, pd->rtMargin.top / 100) );
     data.SetMarginBottomRight( wxPoint(pd->rtMargin.right / 100, pd->rtMargin.bottom / 100) );

-    
+

     return true;
 }
 
     return true;
 }