Better place for coordinate mirroring and removal

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

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index d34be064acd6bdfc447d7a494d92d248feb71f3b..a60068a9eef89dc77e365aa42d797ef32be8037b 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cmndata.cpp
+// Name:        src/common/cmndata.cpp

 // Purpose:     Common GDI data
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     Common GDI data
 // Author:      Julian Smart
 // Modified by:


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,16 +24,20 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/cmndata.h"
+

 #ifndef WX_PRECOMP
 #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 <stdio.h>
     #include "wx/string.h"
     #include "wx/utils.h"
     #include "wx/app.h"

+    #include "wx/log.h"
+    #include "wx/gdicmn.h"

 #endif
 
 #endif
 

-#include "wx/gdicmn.h"
-#include "wx/cmndata.h"
-#include "wx/log.h"

 #include "wx/prntbase.h"
 #include "wx/printdlg.h"
 
 #include "wx/prntbase.h"
 #include "wx/printdlg.h"
 


@@ -46,39 +46,21 @@
 #endif // wxUSE_FONTDLG
 
 #if wxUSE_PRINTING_ARCHITECTURE
 #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
+#include "wx/paper.h"

 
 

-    #if defined(__WATCOMC__) || defined(__SYMANTEC__) || defined(__SALFORDC__)
-        #include <windowsx.h>
-        #include <commdlg.h>
-    #endif
-#endif // MSW
-
-#ifdef __WXMAC__
+#if defined(__WXMAC__)

     #include "wx/mac/private/print.h"
 #endif
 
     #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)
-    #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
 
 // ============================================================================
 // implementation


@@ -167,9 +149,6 @@ wxFontDialogBase::~wxFontDialogBase()
 
 wxPrintData::wxPrintData()
 {
 
 wxPrintData::wxPrintData()
 {

-#ifdef __WXMAC__
-    m_nativePrintData = wxNativePrintData::Create() ;
-#endif

     m_bin = wxPRINTBIN_DEFAULT;
     m_printMode = wxPRINT_MODE_PRINTER;
     m_printOrientation = wxPORTRAIT;
     m_bin = wxPRINTBIN_DEFAULT;
     m_printMode = wxPRINT_MODE_PRINTER;
     m_printOrientation = wxPORTRAIT;


@@ -177,13 +156,16 @@ wxPrintData::wxPrintData()
     m_printCollate = false;
 
     // New, 24/3/99
     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_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();
 }
 
     m_nativeData = wxPrintFactory::GetFactory()->CreatePrintNativeData();
 }
 


@@ -191,36 +173,43 @@ wxPrintData::wxPrintData(const wxPrintData& printData)
     : wxObject()
 {
     m_nativeData = NULL;
     : wxObject()
 {
     m_nativeData = NULL;

+    m_privData = NULL;

     (*this) = printData;
 }
 
     (*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)
         delete m_nativeData;
 
 wxPrintData::~wxPrintData()
 {
     m_nativeData->m_ref--;
     if (m_nativeData->m_ref == 0)
         delete m_nativeData;
 

-#ifdef __WXMAC__
-    delete m_nativePrintData ;
-#endif
+    if (m_privData)
+        delete [] m_privData;

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

-#ifdef __WXMAC__
-    m_nativePrintData->TransferFrom( this ) ;
-#else

     m_nativeData->TransferFrom( *this ) ;
     m_nativeData->TransferFrom( *this ) ;

-#endif

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

-#ifdef __WXMAC__
-    m_nativePrintData->TransferTo( this ) ;
-#else

     m_nativeData->TransferTo( *this ) ;
     m_nativeData->TransferTo( *this ) ;

-#endif

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


@@ -249,13 +238,21 @@ void wxPrintData::operator=(const wxPrintData& data)
     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
+    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?
 }
 
 // Is this data OK for showing the print dialog?

-bool wxPrintData::Ok() const
+bool wxPrintData::IsOk() const

 {
     m_nativeData->TransferFrom( *this );
 
 {
     m_nativeData->TransferFrom( *this );
 


@@ -280,7 +277,7 @@ wxString wxPrintData::GetPrinterCommand() const
     if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
         return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPrinterCommand();
 #endif
     if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
         return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPrinterCommand();
 #endif

-    return wxT("");
+    return wxEmptyString;

 }
 
 wxString wxPrintData::GetPrinterOptions() const
 }
 
 wxString wxPrintData::GetPrinterOptions() const


@@ -289,7 +286,7 @@ wxString wxPrintData::GetPrinterOptions() const
     if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
         return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPrinterOptions();
 #endif
     if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
         return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPrinterOptions();
 #endif

-    return wxT("");
+    return wxEmptyString;

 }
 
 wxString wxPrintData::GetPreviewCommand() const
 }
 
 wxString wxPrintData::GetPreviewCommand() const


@@ -298,7 +295,7 @@ wxString wxPrintData::GetPreviewCommand() const
     if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
         return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPreviewCommand();
 #endif
     if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
         return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPreviewCommand();
 #endif

-    return wxT("");
+    return wxEmptyString;

 }
 
 wxString wxPrintData::GetFontMetricPath() const
 }
 
 wxString wxPrintData::GetFontMetricPath() const


@@ -307,7 +304,7 @@ wxString wxPrintData::GetFontMetricPath() const
     if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
         return ((wxPostScriptPrintNativeData*)m_nativeData)->GetFontMetricPath();
 #endif
     if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
         return ((wxPostScriptPrintNativeData*)m_nativeData)->GetFontMetricPath();
 #endif

-    return wxT("");
+    return wxEmptyString;

 }
 
 double wxPrintData::GetPrinterScaleX() const
 }
 
 double wxPrintData::GetPrinterScaleX() const


@@ -485,23 +482,6 @@ wxPrintDialogData::~wxPrintDialogData()
 {
 }
 
 {
 }
 

-#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;
 void wxPrintDialogData::operator=(const wxPrintDialogData& data)
 {
     m_printFromPage = data.m_printFromPage;


@@ -534,14 +514,14 @@ void wxPrintDialogData::operator=(const wxPrintData& data)
 
 wxPageSetupDialogData::wxPageSetupDialogData()
 {
 
 wxPageSetupDialogData::wxPageSetupDialogData()
 {

-    m_paperSize = wxSize(0, 0);
+    m_paperSize = wxSize(0,0);

 
     CalculatePaperSizeFromId();
 
 
     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;
 
     // Flags
     m_defaultMinMargins = false;


@@ -561,11 +541,11 @@ wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData& dialog
 
 wxPageSetupDialogData::wxPageSetupDialogData(const wxPrintData& printData)
 {
 
 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;
 
     // Flags
     m_defaultMinMargins = false;


@@ -599,7 +579,7 @@ wxPageSetupDialogData& wxPageSetupDialogData::operator=(const wxPageSetupDialogD
     m_enableOrientation = data.m_enableOrientation;
     m_enablePaper = data.m_enablePaper;
     m_enablePrinter = data.m_enablePrinter;
     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;
     m_enableHelp = data.m_enableHelp;
 
     m_printData = data.m_printData;


@@ -615,36 +595,6 @@ wxPageSetupDialogData& wxPageSetupDialogData::operator=(const wxPrintData& data)
     return *this;
 }
 
     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)
 // 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)


@@ -665,7 +615,7 @@ void wxPageSetupDialogData::SetPaperSize(wxPaperSize id)
 void wxPageSetupDialogData::SetPrintData(const wxPrintData& printData)
 {
     m_printData = printData;
 void wxPageSetupDialogData::SetPrintData(const wxPrintData& printData)
 {
     m_printData = printData;

-    CalculatePaperSizeFromId();    
+    CalculatePaperSizeFromId();

 }
 
 // Use paper size defined in this object to set the wxPrintData
 }
 
 // Use paper size defined in this object to set the wxPrintData