Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moving wxMac to new printing architecture

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2005-04-01 16:36:36 +00:00
parent 54c5498d0f
commit dc7ccb9c5d
8 changed files with 116 additions and 541 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/wx/cmndata.h
View File

@@ -147,12 +147,6 @@ private:
* Encapsulates printer information (not printer dialog information)
*/
#ifdef __WXMAC__
class wxNativePrintData ;
#endif
enum wxPrintBin
{
wxPRINTBIN_DEFAULT,
@@ -251,11 +245,6 @@ public:
// Holds the native print data
wxPrintNativeDataBase *GetNativeData() const { return m_nativeData; }
public:
#if defined(__WXMAC__)
wxNativePrintData* m_nativePrintData ;
#endif
private:
wxPrintBin m_bin;
wxPrintMode m_printMode;
@@ -340,11 +329,6 @@ public:
void operator=(const wxPrintDialogData& data);
void operator=(const wxPrintData& data); // Sets internal m_printData member
#if defined(__WXMAC__)
void ConvertToNative();
void ConvertFromNative();
#endif
private:
int m_printFromPage;
int m_printToPage;
@@ -423,11 +407,6 @@ public:
void EnablePrinter(bool flag) { m_enablePrinter = flag; };
void EnableHelp(bool flag) { m_enableHelp = flag; };
#if defined(__WXMAC__)
void ConvertToNative();
void ConvertFromNative();
#endif
// Use paper size defined in this object to set the wxPrintData
// paper id
void CalculateIdFromPaperSize();

16
include/wx/mac/carbon/printdlg.h
View File

@@ -22,22 +22,6 @@
#include "wx/cmndata.h"
#include "wx/printdlg.h"
#include "wx/prntbase.h"
//----------------------------------------------------------------------------
// wxMacPrintNativeData
//----------------------------------------------------------------------------
class WXDLLEXPORT wxMacPrintNativeData: public wxPrintNativeDataBase
{
public:
wxMacPrintNativeData() {};
virtual ~wxMacPrintNativeData() {};
virtual bool TransferTo( wxPrintData &data ) { return true; }
virtual bool TransferFrom( const wxPrintData &data ) { return true; }
virtual bool Ok() const { return true; }
};
/*
* wxMacPrintDialog

42
include/wx/mac/carbon/private/print.h
View File

@@ -13,6 +13,7 @@
#define _WX_MAC_PRIVATE_PRINT_H_
#include "wx/cmndata.h"
#include "wx/print.h"
#include "wx/mac/private.h"
#if TARGET_CARBON && !defined(__DARWIN__)
@@ -27,53 +28,30 @@
#error "only Carbon Printing Session API is supported"
#endif
class wxNativePrintData
{
public :
wxNativePrintData() {}
virtual ~wxNativePrintData() {}
virtual void TransferFrom( wxPrintData * ) = 0 ;
virtual void TransferTo( wxPrintData * ) = 0 ;
virtual void TransferFrom( wxPageSetupDialogData * ) = 0 ;
virtual void TransferTo( wxPageSetupDialogData * ) = 0 ;
virtual void TransferFrom( wxPrintDialogData * ) = 0 ;
virtual void TransferTo( wxPrintDialogData * ) = 0 ;
virtual void CopyFrom( wxNativePrintData * ) = 0;
virtual int ShowPrintDialog() = 0 ;
virtual int ShowPageSetupDialog() = 0 ;
static wxNativePrintData* Create() ;
} ;
class wxMacCarbonPrintData : public wxNativePrintData
class WXDLLEXPORT wxMacCarbonPrintData : public wxPrintNativeDataBase
{
public :
wxMacCarbonPrintData() ;
~wxMacCarbonPrintData() ;
virtual void TransferFrom( wxPrintData * ) ;
virtual void TransferTo( wxPrintData * ) ;
virtual ~wxMacCarbonPrintData() ;
virtual bool TransferTo( wxPrintData &data );
virtual bool TransferFrom( const wxPrintData &data );
virtual bool Ok() const ;
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 :
PMPrintSession m_macPrintSession ;
PMPageFormat m_macPageFormat ;
PMPrintSettings m_macPrintSettings ;
private:
DECLARE_DYNAMIC_CLASS(wxMacCarbonPrintData)
} ;
#endif