Applied modified form of the StdButtonSize patch.

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

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 2a5523a1c4f79b0f69d8f08b8e0ae4f52f38c08b..bb44120bcf56bd152efe1d73d06fef698e42ff39 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -49,7 +49,7 @@
     #include "wx/paper.h"
 #endif // wxUSE_PRINTING_ARCHITECTURE
 
     #include "wx/paper.h"
 #endif // wxUSE_PRINTING_ARCHITECTURE
 

-#if defined(__WXMSW__) && !defined(__PALMOS__)
+#if defined(__WXMSW__)

     #include <windowsx.h>
     #include "wx/msw/private.h"
 
     #include <windowsx.h>
     #include "wx/msw/private.h"
 


@@ -171,6 +171,7 @@ wxPrintData::wxPrintData()
     m_nativePrintData = wxNativePrintData::Create() ;
 #endif
     m_bin = wxPRINTBIN_DEFAULT;
     m_nativePrintData = wxNativePrintData::Create() ;
 #endif
     m_bin = wxPRINTBIN_DEFAULT;

+    m_printMode = wxPRINT_MODE_PRINTER;

     m_printOrientation = wxPORTRAIT;
     m_printNoCopies = 1;
     m_printCollate = false;
     m_printOrientation = wxPORTRAIT;
     m_printNoCopies = 1;
     m_printCollate = false;


@@ -189,32 +190,38 @@ wxPrintData::wxPrintData()
 wxPrintData::wxPrintData(const wxPrintData& printData)
     : wxObject()
 {
 wxPrintData::wxPrintData(const wxPrintData& printData)
     : wxObject()
 {

+    m_nativeData = NULL;

     (*this) = printData;
 }
 
 wxPrintData::~wxPrintData()
 {
     m_nativeData->m_ref--;
     (*this) = printData;
 }
 
 wxPrintData::~wxPrintData()
 {
     m_nativeData->m_ref--;

-    if (m_nativeData->m_ref == 0) 
+    if (m_nativeData->m_ref == 0)

         delete m_nativeData;
         delete m_nativeData;

-        
+

 #ifdef __WXMAC__
     delete m_nativePrintData ;
 #endif
 }
 
 #ifdef __WXMAC__
     delete m_nativePrintData ;
 #endif
 }
 

-
-#ifdef __WXMAC__

 void wxPrintData::ConvertToNative()
 {
 void wxPrintData::ConvertToNative()
 {

+#ifdef __WXMAC__

     m_nativePrintData->TransferFrom( this ) ;
     m_nativePrintData->TransferFrom( this ) ;

+#else
+    m_nativeData->TransferFrom( *this ) ;
+#endif

 }
 
 void wxPrintData::ConvertFromNative()
 {
 }
 
 void wxPrintData::ConvertFromNative()
 {

+#ifdef __WXMAC__

     m_nativePrintData->TransferTo( this ) ;
     m_nativePrintData->TransferTo( this ) ;

-}
+#else
+    m_nativeData->TransferTo( *this ) ;

 #endif
 #endif

+}

 
 void wxPrintData::operator=(const wxPrintData& data)
 {
 
 void wxPrintData::operator=(const wxPrintData& data)
 {


@@ -228,10 +235,20 @@ void wxPrintData::operator=(const wxPrintData& data)
     m_paperId = data.m_paperId;
     m_paperSize = data.m_paperSize;
     m_bin = data.m_bin;
     m_paperId = data.m_paperId;
     m_paperSize = data.m_paperSize;
     m_bin = data.m_bin;

-    
+    m_printMode = data.m_printMode;
+    m_filename = data.m_filename;
+
+    // UnRef old m_nativeData
+    if (m_nativeData)
+    {
+        m_nativeData->m_ref--;
+        if (m_nativeData->m_ref == 0)
+            delete m_nativeData;
+    }
+    // Set Ref new one

     m_nativeData = data.GetNativeData();
     m_nativeData->m_ref++;
     m_nativeData = data.GetNativeData();
     m_nativeData->m_ref++;

-    
+

 #ifdef __WXMAC__
     m_nativePrintData->CopyFrom( data.m_nativePrintData ) ;
 #endif
 #ifdef __WXMAC__
     m_nativePrintData->CopyFrom( data.m_nativePrintData ) ;
 #endif


@@ -245,15 +262,177 @@ bool wxPrintData::Ok() const
     return m_nativeData->Ok();
 }
 
     return m_nativeData->Ok();
 }
 

+// What should happen here?  wxPostScriptPrintNativeData is not
+// defined unless all this is true on MSW.
+#if WXWIN_COMPATIBILITY_2_4 && wxUSE_PRINTING_ARCHITECTURE && (!defined(__WXMSW__) || wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
+
+#include "wx/generic/prntdlgg.h"
+
+#if wxUSE_POSTSCRIPT
+    #define WXUNUSED_WITHOUT_PS(name) name
+#else
+    #define WXUNUSED_WITHOUT_PS(name) WXUNUSED(name)
+#endif
+
+wxString wxPrintData::GetPrinterCommand() const
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPrinterCommand();
+#endif
+    return wxT("");
+}
+
+wxString wxPrintData::GetPrinterOptions() const
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPrinterOptions();
+#endif
+    return wxT("");
+}
+
+wxString wxPrintData::GetPreviewCommand() const
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPreviewCommand();
+#endif
+    return wxT("");
+}
+
+wxString wxPrintData::GetFontMetricPath() const
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetFontMetricPath();
+#endif
+    return wxT("");
+}
+
+double wxPrintData::GetPrinterScaleX() const
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPrinterScaleX();
+#endif
+    return 1.0;
+}
+
+double wxPrintData::GetPrinterScaleY() const
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPrinterScaleY();
+#endif
+    return 1.0;
+}
+
+long wxPrintData::GetPrinterTranslateX() const
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPrinterTranslateX();
+#endif
+    return 0;
+}
+
+long wxPrintData::GetPrinterTranslateY() const
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPrinterTranslateY();
+#endif
+    return 0;
+}
+
+void wxPrintData::SetPrinterCommand(const wxString& WXUNUSED_WITHOUT_PS(command))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterCommand( command );
+#endif
+}
+
+void wxPrintData::SetPrinterOptions(const wxString& WXUNUSED_WITHOUT_PS(options))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterOptions( options );
+#endif
+}
+
+void wxPrintData::SetPreviewCommand(const wxString& WXUNUSED_WITHOUT_PS(command))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPreviewCommand( command );
+#endif
+}
+
+void wxPrintData::SetFontMetricPath(const wxString& WXUNUSED_WITHOUT_PS(path))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetFontMetricPath( path );
+#endif
+}
+
+void wxPrintData::SetPrinterScaleX(double WXUNUSED_WITHOUT_PS(x))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterScaleX( x );
+#endif
+}
+
+void wxPrintData::SetPrinterScaleY(double WXUNUSED_WITHOUT_PS(y))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterScaleY( y );
+#endif
+}
+
+void wxPrintData::SetPrinterScaling(double WXUNUSED_WITHOUT_PS(x), double WXUNUSED_WITHOUT_PS(y))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterScaling( x, y );
+#endif
+}
+
+void wxPrintData::SetPrinterTranslateX(long WXUNUSED_WITHOUT_PS(x))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterTranslateX( x );
+#endif
+}
+
+void wxPrintData::SetPrinterTranslateY(long WXUNUSED_WITHOUT_PS(y))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterTranslateY( y );
+#endif
+}
+
+void wxPrintData::SetPrinterTranslation(long WXUNUSED_WITHOUT_PS(x), long WXUNUSED_WITHOUT_PS(y))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterTranslation( x, y );
+#endif
+}
+#endif
+

 // ----------------------------------------------------------------------------
 // Print dialog data
 // ----------------------------------------------------------------------------
 
 wxPrintDialogData::wxPrintDialogData()
 {
 // ----------------------------------------------------------------------------
 // Print dialog data
 // ----------------------------------------------------------------------------
 
 wxPrintDialogData::wxPrintDialogData()
 {

-#ifdef __WXMSW__
-    m_printDlgData = NULL;
-#endif

     m_printFromPage = 0;
     m_printToPage = 0;
     m_printMinPage = 0;
     m_printFromPage = 0;
     m_printToPage = 0;
     m_printMinPage = 0;


@@ -265,25 +444,24 @@ wxPrintDialogData::wxPrintDialogData()
     m_printSelection = false;
     m_printEnableSelection = false;
     m_printEnablePageNumbers = true;
     m_printSelection = false;
     m_printEnableSelection = false;
     m_printEnablePageNumbers = true;

-    m_printEnablePrintToFile = true;
+
+    wxPrintFactory* factory = wxPrintFactory::GetFactory();
+    m_printEnablePrintToFile = ! factory->HasOwnPrintToFile();
+

     m_printEnableHelp = false;
     m_printEnableHelp = false;

+#if WXWIN_COMPATIBILITY_2_4

     m_printSetupDialog = false;
     m_printSetupDialog = false;

+#endif

 }
 
 wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData& dialogData)
     : wxObject()
 {
 }
 
 wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData& dialogData)
     : wxObject()
 {

-#ifdef __WXMSW__
-    m_printDlgData = NULL;
-#endif

     (*this) = dialogData;
 }
 
 wxPrintDialogData::wxPrintDialogData(const wxPrintData& printData)
 {
     (*this) = dialogData;
 }
 
 wxPrintDialogData::wxPrintDialogData(const wxPrintData& printData)
 {

-#ifdef __WXMSW__
-    m_printDlgData = NULL;
-#endif

     m_printFromPage = 1;
     m_printToPage = 0;
     m_printMinPage = 1;
     m_printFromPage = 1;
     m_printToPage = 0;
     m_printMinPage = 1;


@@ -297,205 +475,15 @@ wxPrintDialogData::wxPrintDialogData(const wxPrintData& printData)
     m_printEnablePageNumbers = true;
     m_printEnablePrintToFile = true;
     m_printEnableHelp = false;
     m_printEnablePageNumbers = true;
     m_printEnablePrintToFile = true;
     m_printEnableHelp = false;

+#if WXWIN_COMPATIBILITY_2_4

     m_printSetupDialog = false;
     m_printSetupDialog = false;

-
+#endif

     m_printData = printData;
 }
 
 wxPrintDialogData::~wxPrintDialogData()
 {
     m_printData = printData;
 }
 
 wxPrintDialogData::~wxPrintDialogData()
 {

-#ifdef __WXMSW__
-    PRINTDLG *pd = (PRINTDLG *) m_printDlgData;
-    if ( pd && pd->hDevMode )
-        GlobalFree(pd->hDevMode);
-    if ( pd )
-        delete pd;
-#endif
-}
-
-#ifdef __WXMSW__
-void wxPrintDialogData::ConvertToNative()
-{
-    wxWindowsPrintNativeData *data =
-        (wxWindowsPrintNativeData *) m_printData.GetNativeData();
-    data->TransferFrom( m_printData );
-
-    PRINTDLG *pd = (PRINTDLG*) m_printDlgData;
-
-    if (!pd)
-    {
-        pd = new PRINTDLG;
-        memset( pd, 0, sizeof(PRINTDLG) );
-        m_printDlgData = (void*) pd;
-
-        // GNU-WIN32 has the wrong size PRINTDLG - can't work out why.
-#ifdef __GNUWIN32__
-        pd->lStructSize    = 66;
-#else
-        pd->lStructSize    = sizeof(PRINTDLG);
-#endif
-        pd->hwndOwner      = (HWND)NULL;
-        pd->hDevMode       = NULL; // Will be created by PrintDlg
-        pd->hDevNames      = NULL; // Ditto
-
-        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)
-    {
-        GlobalFree(pd->hDevMode);
-    }
-
-    // Pass the devnames data to the PRINTDLG structure, since it'll
-    // be needed when PrintDlg is called.
-    if (pd->hDevNames)
-    {
-        GlobalFree(pd->hDevNames);
-    }
-
-    pd->hDevMode = (HGLOBAL)(DWORD) data->GetDevMode();
-
-    data->SetDevMode( (void*) NULL);
-
-    // Shouldn't assert; we should be able to test Ok-ness at a higher level
-    //wxASSERT_MSG( (pd->hDevMode), wxT("hDevMode must be non-NULL in ConvertToNative!"));
-
-    pd->hDevNames = (HGLOBAL)(DWORD) data->GetDevNames();
-
-    data->SetDevNames( (void*) NULL);
-
-    pd->hDC = (HDC) NULL;
-    pd->nFromPage = (WORD)m_printFromPage;
-    pd->nToPage = (WORD)m_printToPage;
-    pd->nMinPage = (WORD)m_printMinPage;
-    pd->nMaxPage = (WORD)m_printMaxPage;
-    pd->nCopies = (WORD)m_printNoCopies;
-
-    pd->Flags = PD_RETURNDC;
-
-#ifdef __GNUWIN32__
-    pd->lStructSize = 66;
-#else
-    pd->lStructSize = sizeof( PRINTDLG );
-#endif
-
-    pd->hwndOwner=(HWND)NULL;
-//    pd->hDevNames=(HANDLE)NULL;
-    pd->hInstance=(HINSTANCE)NULL;
-    pd->lCustData = (LPARAM) NULL;
-    pd->lpfnPrintHook = NULL;
-    pd->lpfnSetupHook = NULL;
-    pd->lpPrintTemplateName = NULL;
-    pd->lpSetupTemplateName = NULL;
-    pd->hPrintTemplate = (HGLOBAL) NULL;
-    pd->hSetupTemplate = (HGLOBAL) NULL;
-
-    if ( m_printAllPages )
-        pd->Flags |= PD_ALLPAGES;
-    if ( m_printSelection )
-        pd->Flags |= PD_SELECTION;
-    if ( m_printCollate )
-        pd->Flags |= PD_COLLATE;
-    if ( m_printToFile )
-        pd->Flags |= PD_PRINTTOFILE;
-    if ( !m_printEnablePrintToFile )
-        pd->Flags |= PD_DISABLEPRINTTOFILE;
-    if ( !m_printEnableSelection )
-        pd->Flags |= PD_NOSELECTION;
-    if ( !m_printEnablePageNumbers )
-        pd->Flags |= PD_NOPAGENUMS;
-    else if ( (!m_printAllPages) && (!m_printSelection) && (m_printFromPage != 0) && (m_printToPage != 0))
-        pd->Flags |= PD_PAGENUMS;
-    if ( m_printEnableHelp )
-        pd->Flags |= PD_SHOWHELP;
-    if ( m_printSetupDialog )
-        pd->Flags |= PD_PRINTSETUP;
-}
-
-void wxPrintDialogData::ConvertFromNative()
-{
-    PRINTDLG *pd = (PRINTDLG*) m_printDlgData;
-    if ( pd == NULL )
-        return;
-
-    wxWindowsPrintNativeData *data =
-        (wxWindowsPrintNativeData *) m_printData.GetNativeData();
-    
-    // Pass the devmode data back to the wxPrintData structure where it really belongs.
-    if (pd->hDevMode)
-    {
-        if (data->GetDevMode())
-        {
-            // Make sure we don't leak memory
-            GlobalFree( (HGLOBAL)(DWORD) data->GetDevMode() );
-        }
-        data->SetDevMode( (void*)(long) pd->hDevMode );
-        pd->hDevMode = NULL;
-    }
-
-    // Pass the devnames data back to the wxPrintData structure where it really belongs.
-    if (pd->hDevNames)
-    {
-        if (data->GetDevNames())
-        {
-            // Make sure we don't leak memory
-            GlobalFree((HGLOBAL)(DWORD) data->GetDevNames());
-        }
-        data->SetDevNames((void*)(long) pd->hDevNames);
-        pd->hDevNames = NULL;
-    }
-
-    // Now convert the DEVMODE object, passed down from the PRINTDLG object,
-    // into wxWidgets form.
-    data->TransferTo( m_printData );
-
-    m_printFromPage = pd->nFromPage;
-    m_printToPage = pd->nToPage;
-    m_printMinPage = pd->nMinPage;
-    m_printMaxPage = pd->nMaxPage;
-    m_printNoCopies = pd->nCopies;
-
-    m_printAllPages = (((pd->Flags & PD_PAGENUMS) != PD_PAGENUMS) && ((pd->Flags & PD_SELECTION) != PD_SELECTION));
-    m_printSelection = ((pd->Flags & PD_SELECTION) == PD_SELECTION);
-    m_printCollate = ((pd->Flags & PD_COLLATE) == PD_COLLATE);
-    m_printToFile = ((pd->Flags & PD_PRINTTOFILE) == PD_PRINTTOFILE);
-    m_printEnablePrintToFile = ((pd->Flags & PD_DISABLEPRINTTOFILE) != PD_DISABLEPRINTTOFILE);
-    m_printEnableSelection = ((pd->Flags & PD_NOSELECTION) != PD_NOSELECTION);
-    m_printEnablePageNumbers = ((pd->Flags & PD_NOPAGENUMS) != PD_NOPAGENUMS);
-    m_printEnableHelp = ((pd->Flags & PD_SHOWHELP) == PD_SHOWHELP);
-    m_printSetupDialog = ((pd->Flags & PD_PRINTSETUP) == PD_PRINTSETUP);
-
-/* port is obsolete in WIN32
-    // Get the port name
-    if (pd->hDevNames)
-    {
-        LPDEVNAMES lpDevNames = (LPDEVNAMES)GlobalLock(pd->hDevNames);
-        if (lpDevNames) {
-            m_printData.SetPortName((LPSTR)lpDevNames + lpDevNames->wDriverOffset);
-            wxString devName = (LPSTR)lpDevNames + lpDevNames->wDeviceOffset;
-            GlobalUnlock(pd->hDevNames);
-
-//            wxASSERT_MSG( (m_printerName == "" || (devName == m_printerName)), "Printer name obtained from DEVMODE and DEVNAMES were different!");
-        }
-    }
-*/
-}
-
-void wxPrintDialogData::SetOwnerWindow(wxWindow* win)
-{
-    if ( m_printDlgData == NULL )
-        ConvertToNative();
-
-    if ( m_printDlgData != NULL && win != NULL)
-    {
-        PRINTDLG *pd = (PRINTDLG *) m_printDlgData;
-        pd->hwndOwner=(HWND) win->GetHWND();
-    }

 }
 }

-#endif // MSW

 
 #ifdef __WXMAC__
 
 
 #ifdef __WXMAC__
 


@@ -529,8 +517,9 @@ void wxPrintDialogData::operator=(const wxPrintDialogData& data)
     m_printEnablePageNumbers = data.m_printEnablePageNumbers;
     m_printEnableHelp = data.m_printEnableHelp;
     m_printEnablePrintToFile = data.m_printEnablePrintToFile;
     m_printEnablePageNumbers = data.m_printEnablePageNumbers;
     m_printEnableHelp = data.m_printEnableHelp;
     m_printEnablePrintToFile = data.m_printEnablePrintToFile;

+#if WXWIN_COMPATIBILITY_2_4

     m_printSetupDialog = data.m_printSetupDialog;
     m_printSetupDialog = data.m_printSetupDialog;

-
+#endif

     m_printData = data.m_printData;
 }
 
     m_printData = data.m_printData;
 }
 


@@ -545,9 +534,6 @@ void wxPrintDialogData::operator=(const wxPrintData& data)
 
 wxPageSetupDialogData::wxPageSetupDialogData()
 {
 
 wxPageSetupDialogData::wxPageSetupDialogData()
 {

-#if defined(__WIN95__)
-    m_pageSetupData = NULL;
-#endif

     m_paperSize = wxSize(0, 0);
 
     CalculatePaperSizeFromId();
     m_paperSize = wxSize(0, 0);
 
     CalculatePaperSizeFromId();


@@ -570,17 +556,11 @@ wxPageSetupDialogData::wxPageSetupDialogData()
 wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData& dialogData)
     : wxObject()
 {
 wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData& dialogData)
     : wxObject()
 {

-#if defined(__WIN95__)
-    m_pageSetupData = NULL;
-#endif

     (*this) = dialogData;
 }
 
 wxPageSetupDialogData::wxPageSetupDialogData(const wxPrintData& printData)
 {
     (*this) = dialogData;
 }
 
 wxPageSetupDialogData::wxPageSetupDialogData(const wxPrintData& printData)
 {

-#if defined(__WIN95__)
-    m_pageSetupData = NULL;
-#endif

     m_paperSize = wxSize(0, 0);
     m_minMarginTopLeft = wxPoint(0, 0);
     m_minMarginBottomRight = wxPoint(0, 0);
     m_paperSize = wxSize(0, 0);
     m_minMarginTopLeft = wxPoint(0, 0);
     m_minMarginBottomRight = wxPoint(0, 0);


@@ -605,15 +585,6 @@ wxPageSetupDialogData::wxPageSetupDialogData(const wxPrintData& printData)
 
 wxPageSetupDialogData::~wxPageSetupDialogData()
 {
 
 wxPageSetupDialogData::~wxPageSetupDialogData()
 {

-#if defined(__WIN95__) && defined(__WXMSW__)
-    PAGESETUPDLG *pd = (PAGESETUPDLG *)m_pageSetupData;
-    if ( pd && pd->hDevMode )
-        GlobalFree(pd->hDevMode);
-    if ( pd && pd->hDevNames )
-        GlobalFree(pd->hDevNames);
-    if ( pd )
-        delete pd;
-#endif

 }
 
 wxPageSetupDialogData& wxPageSetupDialogData::operator=(const wxPageSetupDialogData& data)
 }
 
 wxPageSetupDialogData& wxPageSetupDialogData::operator=(const wxPageSetupDialogData& data)


@@ -643,188 +614,6 @@ wxPageSetupDialogData& wxPageSetupDialogData::operator=(const wxPrintData& data)
     return *this;
 }
 
     return *this;
 }
 

-#if defined(__WIN95__)
-void wxPageSetupDialogData::ConvertToNative()
-{
-    wxWindowsPrintNativeData *data =
-        (wxWindowsPrintNativeData *) m_printData.GetNativeData();
-    data->TransferFrom( m_printData );
-
-    PAGESETUPDLG *pd = (PAGESETUPDLG*) m_pageSetupData;
-
-    if ( m_pageSetupData == NULL )
-    {
-        pd = new PAGESETUPDLG;
-        pd->hDevMode = NULL;
-        pd->hDevNames = NULL;
-        m_pageSetupData = (void *)pd;
-    }
-
-    // Pass the devmode data (created in m_printData.ConvertToNative)
-    // to the PRINTDLG structure, since it'll
-    // be needed when PrintDlg is called.
-
-    if (pd->hDevMode)
-    {
-        GlobalFree(pd->hDevMode);
-        pd->hDevMode = NULL;
-    }
-
-    pd->hDevMode = (HGLOBAL) data->GetDevMode();
-
-    data->SetDevMode( (void*) NULL );
-
-    // Shouldn't assert; we should be able to test Ok-ness at a higher level
-    //wxASSERT_MSG( (pd->hDevMode), wxT("hDevMode must be non-NULL in ConvertToNative!"));
-
-    // Pass the devnames data (created in m_printData.ConvertToNative)
-    // to the PRINTDLG structure, since it'll
-    // be needed when PrintDlg is called.
-
-    if (pd->hDevNames)
-    {
-        GlobalFree(pd->hDevNames);
-        pd->hDevNames = NULL;
-    }
-
-    pd->hDevNames = (HGLOBAL) data->GetDevNames();
-
-    data->SetDevNames((void*) NULL);
-
-//        pd->hDevMode = GlobalAlloc(GMEM_MOVEABLE, sizeof(DEVMODE));
-
-    pd->Flags = PSD_MARGINS|PSD_MINMARGINS;
-
-    if ( m_defaultMinMargins )
-        pd->Flags |= PSD_DEFAULTMINMARGINS;
-    if ( !m_enableMargins )
-        pd->Flags |= PSD_DISABLEMARGINS;
-    if ( !m_enableOrientation )
-        pd->Flags |= PSD_DISABLEORIENTATION;
-    if ( !m_enablePaper )
-        pd->Flags |= PSD_DISABLEPAPER;
-    if ( !m_enablePrinter )
-        pd->Flags |= PSD_DISABLEPRINTER;
-    if ( m_getDefaultInfo )
-        pd->Flags |= PSD_RETURNDEFAULT;
-    if ( m_enableHelp )
-        pd->Flags |= PSD_SHOWHELP;
-
-    // We want the units to be in hundredths of a millimetre
-    pd->Flags |= PSD_INHUNDREDTHSOFMILLIMETERS;
-
-    pd->lStructSize = sizeof( PAGESETUPDLG );
-    pd->hwndOwner=(HWND)NULL;
-//    pd->hDevNames=(HWND)NULL;
-    pd->hInstance=(HINSTANCE)NULL;
-    //   PAGESETUPDLG is in hundreds of a mm
-    pd->ptPaperSize.x = m_paperSize.x * 100;
-    pd->ptPaperSize.y = m_paperSize.y * 100;
-
-    pd->rtMinMargin.left = m_minMarginTopLeft.x * 100;
-    pd->rtMinMargin.top = m_minMarginTopLeft.y * 100;
-    pd->rtMinMargin.right = m_minMarginBottomRight.x * 100;
-    pd->rtMinMargin.bottom = m_minMarginBottomRight.y * 100;
-
-    pd->rtMargin.left = m_marginTopLeft.x * 100;
-    pd->rtMargin.top = m_marginTopLeft.y * 100;
-    pd->rtMargin.right = m_marginBottomRight.x * 100;
-    pd->rtMargin.bottom = m_marginBottomRight.y * 100;
-
-    pd->lCustData = 0;
-    pd->lpfnPageSetupHook = NULL;
-    pd->lpfnPagePaintHook = NULL;
-    pd->hPageSetupTemplate = NULL;
-    pd->lpPageSetupTemplateName = NULL;
-
-/*
-    if ( pd->hDevMode )
-    {
-        DEVMODE *devMode = (DEVMODE*) GlobalLock(pd->hDevMode);
-        memset(devMode, 0, sizeof(DEVMODE));
-        devMode->dmSize = sizeof(DEVMODE);
-        devMode->dmOrientation = m_orientation;
-        devMode->dmFields = DM_ORIENTATION;
-        GlobalUnlock(pd->hDevMode);
-    }
-*/
-}
-
-void wxPageSetupDialogData::ConvertFromNative()
-{
-    PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageSetupData;
-    if ( !pd )
-        return;
-
-    wxWindowsPrintNativeData *data =
-        (wxWindowsPrintNativeData *) m_printData.GetNativeData();
-        
-    // Pass the devmode data back to the wxPrintData structure where it really belongs.
-    if (pd->hDevMode)
-    {
-        if (data->GetDevMode())
-        {
-            // Make sure we don't leak memory
-            GlobalFree((HGLOBAL) data->GetDevMode());
-        }
-        data->SetDevMode( (void*) pd->hDevMode );
-        pd->hDevMode = NULL;
-    }
-
-    data->TransferTo( m_printData );
-
-    // Pass the devnames data back to the wxPrintData structure where it really belongs.
-    if (pd->hDevNames)
-    {
-        if (data->GetDevNames())
-        {
-            // Make sure we don't leak memory
-            GlobalFree((HGLOBAL) data->GetDevNames());
-        }
-        data->SetDevNames((void*) pd->hDevNames);
-        pd->hDevNames = NULL;
-    }
-
-    data->TransferTo( m_printData );
-
-    pd->Flags = PSD_MARGINS|PSD_MINMARGINS;
-
-    m_defaultMinMargins = ((pd->Flags & PSD_DEFAULTMINMARGINS) == PSD_DEFAULTMINMARGINS);
-    m_enableMargins = ((pd->Flags & PSD_DISABLEMARGINS) != PSD_DISABLEMARGINS);
-    m_enableOrientation = ((pd->Flags & PSD_DISABLEORIENTATION) != PSD_DISABLEORIENTATION);
-    m_enablePaper = ((pd->Flags & PSD_DISABLEPAPER) != PSD_DISABLEPAPER);
-    m_enablePrinter = ((pd->Flags & PSD_DISABLEPRINTER) != PSD_DISABLEPRINTER);
-    m_getDefaultInfo = ((pd->Flags & PSD_RETURNDEFAULT) == PSD_RETURNDEFAULT);
-    m_enableHelp = ((pd->Flags & PSD_SHOWHELP) == PSD_SHOWHELP);
-
-    //   PAGESETUPDLG is in hundreds of a mm
-    m_paperSize.x = pd->ptPaperSize.x / 100;
-    m_paperSize.y = pd->ptPaperSize.y / 100;
-
-    m_minMarginTopLeft.x = pd->rtMinMargin.left / 100;
-    m_minMarginTopLeft.y = pd->rtMinMargin.top / 100;
-    m_minMarginBottomRight.x = pd->rtMinMargin.right / 100;
-    m_minMarginBottomRight.y = pd->rtMinMargin.bottom / 100;
-
-    m_marginTopLeft.x = pd->rtMargin.left / 100;
-    m_marginTopLeft.y = pd->rtMargin.top / 100;
-    m_marginBottomRight.x = pd->rtMargin.right / 100;
-    m_marginBottomRight.y = pd->rtMargin.bottom / 100;
-}
-
-void wxPageSetupDialogData::SetOwnerWindow(wxWindow* win)
-{
-    if ( m_pageSetupData == NULL )
-        ConvertToNative();
-
-    if ( m_pageSetupData != NULL && win != NULL)
-    {
-        PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageSetupData;
-        pd->hwndOwner=(HWND) win->GetHWND();
-    }
-}
-#endif // Win95
-

 #ifdef __WXMAC__
 void wxPageSetupDialogData::ConvertToNative()
 {
 #ifdef __WXMAC__
 void wxPageSetupDialogData::ConvertToNative()
 {