call SetupWindow

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

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 1f839fb728600d29671cb36a7b620d4b22af2121..b0bc37a2fbd747e7de40f61da4f8e96c2810aeb8 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -49,25 +49,16 @@
     #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)
@@ -177,28 +168,51 @@ wxPrintData::wxPrintData()
     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;
-        
+
+    if (m_privData)
+        delete [] m_privData;
+
 #ifdef __WXMAC__
     delete m_nativePrintData ;
 #endif
@@ -235,16 +249,31 @@ 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++;
-    
+
+    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 );
+    }
+
 #ifdef __WXMAC__
     m_nativePrintData->CopyFrom( data.m_nativePrintData ) ;
 #endif
@@ -258,17 +287,25 @@ bool wxPrintData::Ok() const
     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
@@ -277,7 +314,7 @@ 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
@@ -286,7 +323,7 @@ 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
@@ -295,7 +332,7 @@ 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
@@ -334,7 +371,7 @@ long wxPrintData::GetPrinterTranslateY() 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))
@@ -342,7 +379,7 @@ void wxPrintData::SetPrinterCommand(const wxString& command)
 #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))
@@ -350,7 +387,7 @@ void wxPrintData::SetPrinterOptions(const wxString& options)
 #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))
@@ -358,7 +395,7 @@ void wxPrintData::SetPreviewCommand(const wxString& command)
 #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))
@@ -366,7 +403,7 @@ void wxPrintData::SetFontMetricPath(const wxString& path)
 #endif
 }
 
-void wxPrintData::SetPrinterScaleX(double x)
+void wxPrintData::SetPrinterScaleX(double WXUNUSED_WITHOUT_PS(x))
 {
 #if wxUSE_POSTSCRIPT
     if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
@@ -374,7 +411,7 @@ void wxPrintData::SetPrinterScaleX(double x)
 #endif
 }
 
-void wxPrintData::SetPrinterScaleY(double y)
+void wxPrintData::SetPrinterScaleY(double WXUNUSED_WITHOUT_PS(y))
 {
 #if wxUSE_POSTSCRIPT
     if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
@@ -382,7 +419,7 @@ void wxPrintData::SetPrinterScaleY(double y)
 #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))
@@ -390,7 +427,7 @@ void wxPrintData::SetPrinterScaling(double x, double y)
 #endif
 }
 
-void wxPrintData::SetPrinterTranslateX(long x)
+void wxPrintData::SetPrinterTranslateX(long WXUNUSED_WITHOUT_PS(x))
 {
 #if wxUSE_POSTSCRIPT
     if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
@@ -398,7 +435,7 @@ void wxPrintData::SetPrinterTranslateX(long x)
 #endif
 }
 
-void wxPrintData::SetPrinterTranslateY(long y)
+void wxPrintData::SetPrinterTranslateY(long WXUNUSED_WITHOUT_PS(y))
 {
 #if wxUSE_POSTSCRIPT
     if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
@@ -406,7 +443,7 @@ void wxPrintData::SetPrinterTranslateY(long y)
 #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))
@@ -432,10 +469,10 @@ wxPrintDialogData::wxPrintDialogData()
     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;
@@ -522,14 +559,14 @@ void wxPrintDialogData::operator=(const wxPrintData& data)
 
 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;
@@ -549,11 +586,11 @@ wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData& dialog
 
 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;
@@ -598,6 +635,7 @@ wxPageSetupDialogData& wxPageSetupDialogData::operator=(const wxPageSetupDialogD
 wxPageSetupDialogData& wxPageSetupDialogData::operator=(const wxPrintData& data)
 {
     m_printData = data;
+    CalculatePaperSizeFromId();
 
     return *this;
 }
@@ -649,6 +687,12 @@ void wxPageSetupDialogData::SetPaperSize(wxPaperSize id)
     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()