/////////////////////////////////////////////////////////////////////////////
-// Name: cmndata.cpp
+// Name: src/common/cmndata.cpp
// Purpose: Common GDI data
// Author: Julian Smart
// Modified by:
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "cmndata.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#pragma hdrstop
#endif
+#include "wx/cmndata.h"
+
#ifndef WX_PRECOMP
+ #if defined(__WXMSW__)
+ #include "wx/msw/wrapcdlg.h"
+ #endif // MSW
#include <stdio.h>
#include "wx/string.h"
#include "wx/utils.h"
#include "wx/app.h"
+ #include "wx/log.h"
+ #include "wx/gdicmn.h"
#endif
-#include "wx/gdicmn.h"
-#include "wx/cmndata.h"
-#include "wx/log.h"
#include "wx/prntbase.h"
#include "wx/printdlg.h"
#endif // wxUSE_FONTDLG
#if wxUSE_PRINTING_ARCHITECTURE
- #include "wx/paper.h"
-#endif // wxUSE_PRINTING_ARCHITECTURE
-#if defined(__WXMSW__)
- #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
-#endif // MSW
-
- #if wxUSE_PRINTING_ARCHITECTURE
+#include "wx/paper.h"
#if defined(__WXMAC__)
#include "wx/mac/private/print.h"
#endif
- IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
- IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject)
- IMPLEMENT_DYNAMIC_CLASS(wxPageSetupDialogData, wxObject)
- #endif // wxUSE_PRINTING_ARCHITECTURE
+IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxPageSetupDialogData, wxObject)
- IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
- IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
+#endif // wxUSE_PRINTING_ARCHITECTURE
-#ifndef DMPAPER_USER
- #define DMPAPER_USER 256
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
// ============================================================================
// implementation
wxPrintData::wxPrintData()
{
-#ifdef __WXMAC__
- m_nativePrintData = wxNativePrintData::Create() ;
-#endif
m_bin = wxPRINTBIN_DEFAULT;
+ m_media = wxPRINTMEDIA_DEFAULT;
m_printMode = wxPRINT_MODE_PRINTER;
m_printOrientation = wxPORTRAIT;
+ m_printOrientationReversed = false;
m_printNoCopies = 1;
m_printCollate = false;
m_colour = true;
m_duplexMode = wxDUPLEX_SIMPLEX;
m_printQuality = wxPRINT_QUALITY_HIGH;
- m_paperId = wxPAPER_A4;
- m_paperSize = wxSize(210, 297);
+
+ // we intentionally don't initialize paper id and size at all, like this
+ // the default system settings will be used for them
+ m_paperId = wxPAPER_NONE;
+ m_paperSize = wxDefaultSize;
m_privData = NULL;
m_privDataLen = 0;
-
+
m_nativeData = wxPrintFactory::GetFactory()->CreatePrintNativeData();
}
: wxObject()
{
m_nativeData = NULL;
+ m_privData = NULL;
(*this) = printData;
}
m_nativeData->m_ref--;
if (m_nativeData->m_ref == 0)
delete m_nativeData;
-
+
if (m_privData)
delete [] m_privData;
-
-#ifdef __WXMAC__
- delete m_nativePrintData ;
-#endif
}
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_printNoCopies = data.m_printNoCopies;
m_printCollate = data.m_printCollate;
m_printOrientation = data.m_printOrientation;
+ m_printOrientationReversed = data.m_printOrientationReversed;
m_printerName = data.m_printerName;
m_colour = data.m_colour;
m_duplexMode = data.m_duplexMode;
m_paperId = data.m_paperId;
m_paperSize = data.m_paperSize;
m_bin = data.m_bin;
+ m_media = data.m_media;
m_printMode = data.m_printMode;
m_filename = data.m_filename;
m_privData = new char[m_privDataLen];
memcpy( m_privData, data.GetPrivData(), m_privDataLen );
}
-
-#ifdef __WXMAC__
- m_nativePrintData->CopyFrom( data.m_nativePrintData ) ;
-#endif
}
// Is this data OK for showing the print dialog?
-bool wxPrintData::Ok() const
+bool wxPrintData::IsOk() const
{
m_nativeData->TransferFrom( *this );
{
}
-#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;
m_enableOrientation = data.m_enableOrientation;
m_enablePaper = data.m_enablePaper;
m_enablePrinter = data.m_enablePrinter;
- m_getDefaultInfo = data.m_getDefaultInfo;;
+ m_getDefaultInfo = data.m_getDefaultInfo;
m_enableHelp = data.m_enableHelp;
m_printData = data.m_printData;
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)
projects / wxWidgets.git / blobdiff