fix to previous patch: don't crash when saving in 16bpp

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

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index a03afbf303805dbf99b8a716b81ea6bd3933d97f..171f85d13009034170a1148e5b00952f3b524ef7 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -63,11 +63,12 @@
     #endif
 #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)
@@ -534,14 +535,14 @@ void wxPrintDialogData::operator=(const wxPrintData& data)
 
 wxPageSetupDialogData::wxPageSetupDialogData()
 {
-    m_paperSize = wxSize();
+    m_paperSize = wxSize(0,0);
 
     CalculatePaperSizeFromId();
 
     m_minMarginTopLeft =
     m_minMarginBottomRight =
     m_marginTopLeft =
-    m_marginBottomRight = wxPoint();
+    m_marginBottomRight = wxPoint(0,0);
 
     // Flags
     m_defaultMinMargins = false;
@@ -561,11 +562,11 @@ wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData& dialog
 
 wxPageSetupDialogData::wxPageSetupDialogData(const wxPrintData& printData)
 {
-    m_paperSize = wxSize();
+    m_paperSize = wxSize(0,0);
     m_minMarginTopLeft =
     m_minMarginBottomRight =
     m_marginTopLeft =
-    m_marginBottomRight = wxPoint();
+    m_marginBottomRight = wxPoint(0,0);
 
     // Flags
     m_defaultMinMargins = false;