#include "wx/paper.h"
#endif // wxUSE_PRINTING_ARCHITECTURE
-#if defined(__WXMSW__) && !defined(__PALMOS__)
- #include <windowsx.h>
- #include "wx/msw/private.h"
-
- #ifndef __SMARTPHONE__ /* of WinCE */
- #include <commdlg.h>
- #endif
-
- #if defined(__WATCOMC__) || defined(__SYMANTEC__) || defined(__SALFORDC__)
- #include <windowsx.h>
- #include <commdlg.h>
- #endif
+#if defined(__WXMSW__)
+ #include "wx/msw/wrapcdlg.h"
#endif // MSW
-#ifdef __WXMAC__
+ #if wxUSE_PRINTING_ARCHITECTURE
+
+#if defined(__WXMAC__)
#include "wx/mac/private/print.h"
#endif
- #if wxUSE_PRINTING_ARCHITECTURE
IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxPageSetupDialogData, wxObject)
wxPrintData::wxPrintData()
{
-#ifdef __WXMAC__
- m_nativePrintData = wxNativePrintData::Create() ;
-#endif
m_bin = wxPRINTBIN_DEFAULT;
m_printMode = wxPRINT_MODE_PRINTER;
m_printOrientation = wxPORTRAIT;
m_printCollate = false;
// New, 24/3/99
- m_printerName = wxT("");
+ m_printerName = wxEmptyString;
m_colour = true;
m_duplexMode = wxDUPLEX_SIMPLEX;
m_printQuality = wxPRINT_QUALITY_HIGH;
m_paperId = wxPAPER_A4;
m_paperSize = wxSize(210, 297);
+ m_privData = NULL;
+ m_privDataLen = 0;
+
m_nativeData = wxPrintFactory::GetFactory()->CreatePrintNativeData();
}
wxPrintData::wxPrintData(const wxPrintData& printData)
: wxObject()
{
+ m_nativeData = NULL;
+ m_privData = NULL;
(*this) = printData;
}
+void wxPrintData::SetPrivData( char *privData, int len )
+{
+ if (m_privData)
+ {
+ delete [] m_privData;
+ m_privData = NULL;
+ }
+ m_privDataLen = len;
+ if (m_privDataLen > 0)
+ {
+ m_privData = new char[m_privDataLen];
+ memcpy( m_privData, privData, m_privDataLen );
+ }
+}
+
wxPrintData::~wxPrintData()
{
m_nativeData->m_ref--;
- if (m_nativeData->m_ref == 0)
+ if (m_nativeData->m_ref == 0)
delete m_nativeData;
-
-#ifdef __WXMAC__
- delete m_nativePrintData ;
-#endif
+
+ if (m_privData)
+ delete [] m_privData;
}
void wxPrintData::ConvertToNative()
{
-#ifdef __WXMAC__
- m_nativePrintData->TransferFrom( this ) ;
-#else
m_nativeData->TransferFrom( *this ) ;
-#endif
}
void wxPrintData::ConvertFromNative()
{
-#ifdef __WXMAC__
- m_nativePrintData->TransferTo( this ) ;
-#else
m_nativeData->TransferTo( *this ) ;
-#endif
}
void wxPrintData::operator=(const wxPrintData& data)
m_paperSize = data.m_paperSize;
m_bin = data.m_bin;
m_printMode = data.m_printMode;
- m_filename = data.m_filename;
+ m_filename = data.m_filename;
- // UnRef old m_nativeData
- m_nativeData->m_ref--;
- if (m_nativeData->m_ref == 0)
- delete m_nativeData;
+ // 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++;
-
-#ifdef __WXMAC__
- m_nativePrintData->CopyFrom( data.m_nativePrintData ) ;
-#endif
+
+ if (m_privData)
+ {
+ delete [] m_privData;
+ m_privData = NULL;
+ }
+ m_privDataLen = data.GetPrivDataLen();
+ if (m_privDataLen > 0)
+ {
+ m_privData = new char[m_privDataLen];
+ memcpy( m_privData, data.GetPrivData(), m_privDataLen );
+ }
}
// Is this data OK for showing the print dialog?
return m_nativeData->Ok();
}
-#if WXWIN_COMPATIBILITY_2_4
+// 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("");
+ return wxEmptyString;
}
wxString wxPrintData::GetPrinterOptions() const
if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPrinterOptions();
#endif
- return wxT("");
+ return wxEmptyString;
}
wxString wxPrintData::GetPreviewCommand() const
if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPreviewCommand();
#endif
- return wxT("");
+ return wxEmptyString;
}
wxString wxPrintData::GetFontMetricPath() const
if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
return ((wxPostScriptPrintNativeData*)m_nativeData)->GetFontMetricPath();
#endif
- return wxT("");
+ return wxEmptyString;
}
double wxPrintData::GetPrinterScaleX() const
return 0;
}
-void wxPrintData::SetPrinterCommand(const wxString& command)
+void wxPrintData::SetPrinterCommand(const wxString& WXUNUSED_WITHOUT_PS(command))
{
#if wxUSE_POSTSCRIPT
if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
#endif
}
-void wxPrintData::SetPrinterOptions(const wxString& options)
+void wxPrintData::SetPrinterOptions(const wxString& WXUNUSED_WITHOUT_PS(options))
{
#if wxUSE_POSTSCRIPT
if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
#endif
}
-void wxPrintData::SetPreviewCommand(const wxString& command)
+void wxPrintData::SetPreviewCommand(const wxString& WXUNUSED_WITHOUT_PS(command))
{
#if wxUSE_POSTSCRIPT
if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
#endif
}
-void wxPrintData::SetFontMetricPath(const wxString& path)
+void wxPrintData::SetFontMetricPath(const wxString& WXUNUSED_WITHOUT_PS(path))
{
#if wxUSE_POSTSCRIPT
if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
#endif
}
-void wxPrintData::SetPrinterScaleX(double x)
+void wxPrintData::SetPrinterScaleX(double WXUNUSED_WITHOUT_PS(x))
{
#if wxUSE_POSTSCRIPT
if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
#endif
}
-void wxPrintData::SetPrinterScaleY(double y)
+void wxPrintData::SetPrinterScaleY(double WXUNUSED_WITHOUT_PS(y))
{
#if wxUSE_POSTSCRIPT
if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
#endif
}
-void wxPrintData::SetPrinterScaling(double x, double y)
+void wxPrintData::SetPrinterScaling(double WXUNUSED_WITHOUT_PS(x), double WXUNUSED_WITHOUT_PS(y))
{
#if wxUSE_POSTSCRIPT
if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
#endif
}
-void wxPrintData::SetPrinterTranslateX(long x)
+void wxPrintData::SetPrinterTranslateX(long WXUNUSED_WITHOUT_PS(x))
{
#if wxUSE_POSTSCRIPT
if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
#endif
}
-void wxPrintData::SetPrinterTranslateY(long y)
+void wxPrintData::SetPrinterTranslateY(long WXUNUSED_WITHOUT_PS(y))
{
#if wxUSE_POSTSCRIPT
if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
#endif
}
-void wxPrintData::SetPrinterTranslation(long x, long y)
+void wxPrintData::SetPrinterTranslation(long WXUNUSED_WITHOUT_PS(x), long WXUNUSED_WITHOUT_PS(y))
{
#if wxUSE_POSTSCRIPT
if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
m_printSelection = false;
m_printEnableSelection = false;
m_printEnablePageNumbers = true;
-
+
wxPrintFactory* factory = wxPrintFactory::GetFactory();
m_printEnablePrintToFile = ! factory->HasOwnPrintToFile();
-
+
m_printEnableHelp = false;
#if WXWIN_COMPATIBILITY_2_4
m_printSetupDialog = false;
{
}
-#ifdef __WXMAC__
-
-void wxPrintDialogData::ConvertToNative()
-{
- m_printData.ConvertToNative();
- m_printData.m_nativePrintData->TransferFrom( this ) ;
-}
-
-void wxPrintDialogData::ConvertFromNative()
-{
- m_printData.ConvertFromNative();
- m_printData.m_nativePrintData->TransferTo( this ) ;
-}
-
-#endif
-
-
void wxPrintDialogData::operator=(const wxPrintDialogData& data)
{
m_printFromPage = data.m_printFromPage;
wxPageSetupDialogData::wxPageSetupDialogData()
{
- m_paperSize = wxSize(0, 0);
+ m_paperSize = wxSize(0,0);
CalculatePaperSizeFromId();
- m_minMarginTopLeft = wxPoint(0, 0);
- m_minMarginBottomRight = wxPoint(0, 0);
- m_marginTopLeft = wxPoint(0, 0);
- m_marginBottomRight = wxPoint(0, 0);
+ m_minMarginTopLeft =
+ m_minMarginBottomRight =
+ m_marginTopLeft =
+ m_marginBottomRight = wxPoint(0,0);
// Flags
m_defaultMinMargins = false;
wxPageSetupDialogData::wxPageSetupDialogData(const wxPrintData& printData)
{
- m_paperSize = wxSize(0, 0);
- m_minMarginTopLeft = wxPoint(0, 0);
- m_minMarginBottomRight = wxPoint(0, 0);
- m_marginTopLeft = wxPoint(0, 0);
- m_marginBottomRight = wxPoint(0, 0);
+ m_paperSize = wxSize(0,0);
+ m_minMarginTopLeft =
+ m_minMarginBottomRight =
+ m_marginTopLeft =
+ m_marginBottomRight = wxPoint(0,0);
// Flags
m_defaultMinMargins = false;
wxPageSetupDialogData& wxPageSetupDialogData::operator=(const wxPrintData& data)
{
m_printData = data;
+ CalculatePaperSizeFromId();
return *this;
}
-#ifdef __WXMAC__
-void wxPageSetupDialogData::ConvertToNative()
-{
- m_printData.ConvertToNative();
- m_printData.m_nativePrintData->TransferFrom( this ) ;
-}
-
-void wxPageSetupDialogData::ConvertFromNative()
-{
- m_printData.ConvertFromNative ();
- m_paperSize = m_printData.GetPaperSize() ;
- CalculateIdFromPaperSize();
- m_printData.m_nativePrintData->TransferTo( this ) ;
- // adjust minimal values
-
- if ( m_marginTopLeft.x < m_minMarginTopLeft.x )
- m_marginTopLeft.x = m_minMarginTopLeft.x;
-
- if ( m_marginBottomRight.x < m_minMarginBottomRight.x )
- m_marginBottomRight.x = m_minMarginBottomRight.x;
-
- if ( m_marginTopLeft.y < m_minMarginTopLeft.y )
- m_marginTopLeft.y = m_minMarginTopLeft.y;
-
- if ( m_marginBottomRight.y < m_minMarginBottomRight.y )
- m_marginBottomRight.y = m_minMarginBottomRight.y;
-}
-#endif
-
-
// If a corresponding paper type is found in the paper database, will set the m_printData
// paper size id member as well.
void wxPageSetupDialogData::SetPaperSize(const wxSize& sz)
CalculatePaperSizeFromId();
}
+void wxPageSetupDialogData::SetPrintData(const wxPrintData& printData)
+{
+ m_printData = printData;
+ CalculatePaperSizeFromId();
+}
+
// Use paper size defined in this object to set the wxPrintData
// paper id
void wxPageSetupDialogData::CalculateIdFromPaperSize()
projects / wxWidgets.git / blobdiff