Applied modified form of the StdButtonSize patch.

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

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 1f839fb728600d29671cb36a7b620d4b22af2121..bb44120bcf56bd152efe1d73d06fef698e42ff39 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -49,7 +49,7 @@
     #include "wx/paper.h"
 #endif // wxUSE_PRINTING_ARCHITECTURE
 
-#if defined(__WXMSW__) && !defined(__PALMOS__)
+#if defined(__WXMSW__)
     #include <windowsx.h>
     #include "wx/msw/private.h"
 
@@ -190,15 +190,16 @@ wxPrintData::wxPrintData()
 wxPrintData::wxPrintData(const wxPrintData& printData)
     : wxObject()
 {
+    m_nativeData = NULL;
     (*this) = printData;
 }
 
 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
@@ -235,16 +236,19 @@ 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
@@ -258,10 +262,18 @@ 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
@@ -334,7 +346,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 +354,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 +362,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 +370,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 +378,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 +386,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 +394,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 +402,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 +410,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 +418,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 +444,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;