merge of new wxMac code

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-03-27 07:15:02 +00:00
parent 34a336adb6
commit 4f30545658
18 changed files with 322 additions and 1258 deletions

View File

@@ -23,11 +23,9 @@
# include "Printing.h"
#endif
#if TARGET_CARBON
#if !PM_USE_SESSION_APIS
#error "only Carbon Printing Session API is supported"
#endif
#endif
class wxNativePrintData
{
@@ -52,8 +50,6 @@ public :
static wxNativePrintData* Create() ;
} ;
#if TARGET_CARBON
class wxMacCarbonPrintData : public wxNativePrintData
{
public :
@@ -80,28 +76,4 @@ public :
PMPrintSettings m_macPrintSettings ;
} ;
#else
class wxMacClassicPrintData : public wxNativePrintData
{
public :
wxMacClassicPrintData() ;
~wxMacClassicPrintData() ;
virtual void TransferFrom( wxPrintData * ) ;
virtual void TransferTo( wxPrintData * ) ;
virtual void TransferFrom( wxPageSetupDialogData * ) ;
virtual void TransferTo( wxPageSetupDialogData * ) ;
virtual void TransferFrom( wxPrintDialogData * ) ;
virtual void TransferTo( wxPrintDialogData * ) ;
virtual void CopyFrom( wxNativePrintData * ) ;
virtual int ShowPrintDialog() ;
virtual int ShowPageSetupDialog() ;
private :
virtual void ValidateOrCreate() ;
public :
THPrint m_macPrintSettings ;
} ;
#endif
#endif