just to resolve a dummy conflict

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

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index e68681584544c9374324c0513b40fde41292359e..b9c2c8fc0b2a7f6708d0dd450ee6ce59a03caa1d 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -37,17 +37,20 @@
 
 #include "wx/gdicmn.h"
 #include "wx/cmndata.h"
 
 #include "wx/gdicmn.h"
 #include "wx/cmndata.h"

-
-#include "wx/paper.h"
+#include "wx/log.h"

 
 // For compatibility
 #if (defined(__WXMOTIF__) || defined(__WXGTK__)) && wxUSE_POSTSCRIPT
     #define wxCOMPATIBILITY_WITH_PRINTSETUPDATA 1
 #endif
 
 
 // For compatibility
 #if (defined(__WXMOTIF__) || defined(__WXGTK__)) && wxUSE_POSTSCRIPT
     #define wxCOMPATIBILITY_WITH_PRINTSETUPDATA 1
 #endif
 

-#if wxCOMPATIBILITY_WITH_PRINTSETUPDATA
-    #include "wx/generic/dcpsg.h"
-#endif
+#if wxUSE_PRINTING_ARCHITECTURE
+    #include "wx/paper.h"
+
+    #if wxCOMPATIBILITY_WITH_PRINTSETUPDATA
+        #include "wx/generic/dcpsg.h"
+    #endif
+#endif // wxUSE_PRINTING_ARCHITECTURE

 
 #ifdef __WXMSW__
     #include <windows.h>
 
 #ifdef __WXMSW__
     #include <windows.h>


@@ -58,6 +61,11 @@
         #include <commdlg.h>
     #endif // Win16
 
         #include <commdlg.h>
     #endif // Win16
 

+    #ifdef __WXWINE__
+        #include <cderr.h>
+        #include <commdlg.h>
+    #endif
+

     #if defined(__WATCOMC__) || defined(__SC__) || defined(__SALFORDC__)
         #include <windowsx.h>
         #include <commdlg.h>
     #if defined(__WATCOMC__) || defined(__SC__) || defined(__SALFORDC__)
         #include <windowsx.h>
         #include <commdlg.h>


@@ -65,9 +73,11 @@
 #endif // MSW
 
 #if !USE_SHARED_LIBRARY
 #endif // MSW
 
 #if !USE_SHARED_LIBRARY

-    IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
-    IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject)
-    IMPLEMENT_DYNAMIC_CLASS(wxPageSetupDialogData, wxObject)
+    #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(wxFontData, wxObject)
     IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
 #endif
     IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
     IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
 #endif


@@ -162,6 +172,7 @@ void wxFontData::operator=(const wxFontData& data)
     maxSize = data.maxSize;
 }
 
     maxSize = data.maxSize;
 }
 

+#if wxUSE_PRINTING_ARCHITECTURE

 // ----------------------------------------------------------------------------
 // Print data
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Print data
 // ----------------------------------------------------------------------------


@@ -214,8 +225,9 @@ wxPrintData::~wxPrintData()
 #endif
 }
 
 #endif
 }
 

-#if defined(__WXMSW__) && defined(__WIN32__)
+#if defined(__WXMSW__) // && defined(__WIN32__)

 
 

+#ifdef __WIN32__

 static wxString wxGetPrintDlgError()
 {
     DWORD err = CommDlgExtendedError();
 static wxString wxGetPrintDlgError()
 {
     DWORD err = CommDlgExtendedError();


@@ -248,8 +260,7 @@ static wxString wxGetPrintDlgError()
     }
     return msg;
 }
     }
     return msg;
 }

- 
-
+#endif

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


@@ -313,13 +324,17 @@ void wxPrintData::ConvertToNative()
 
         //// Orientation
 
 
         //// Orientation
 

+#ifndef __WXWINE__

         devMode->dmOrientation = m_printOrientation;
         devMode->dmOrientation = m_printOrientation;

+#endif

         devMode->dmFields = DM_ORIENTATION;
 
         //// Collation
 
         devMode->dmFields = DM_ORIENTATION;
 
         //// Collation
 

+#ifndef __WIN16__

         devMode->dmCollate = (m_printCollate ? DMCOLLATE_TRUE : DMCOLLATE_FALSE);
         devMode->dmFields |= DM_COLLATE;
         devMode->dmCollate = (m_printCollate ? DMCOLLATE_TRUE : DMCOLLATE_FALSE);
         devMode->dmFields |= DM_COLLATE;

+#endif

 
         //// Number of copies
 
 
         //// Number of copies
 


@@ -347,6 +362,7 @@ void wxPrintData::ConvertToNative()
 
         devMode->dmFields |= DM_COLOR;
 
 
         devMode->dmFields |= DM_COLOR;
 

+#ifndef __WXWINE__

         //// Paper size
 
         if (m_paperId == wxPAPER_NONE)
         //// Paper size
 
         if (m_paperId == wxPAPER_NONE)


@@ -368,6 +384,7 @@ void wxPrintData::ConvertToNative()
                 }
             }
         }
                 }
             }
         }

+#endif

 
         //// Duplex
 
 
         //// Duplex
 


@@ -427,13 +444,16 @@ void wxPrintData::ConvertFromNative()
     {
         DEVMODE *devMode = (DEVMODE*) GlobalLock(hDevMode);
 
     {
         DEVMODE *devMode = (DEVMODE*) GlobalLock(hDevMode);
 

+#ifndef __WXWINE__

         //// Orientation
 
         if (devMode->dmFields & DM_ORIENTATION)
             m_printOrientation = devMode->dmOrientation;
         //// Orientation
 
         if (devMode->dmFields & DM_ORIENTATION)
             m_printOrientation = devMode->dmOrientation;

+#endif

 
         //// Collation
 
 
         //// Collation
 

+#ifndef __WIN16__

         if (devMode->dmFields & DM_COLLATE)
         {
             if (devMode->dmCollate == DMCOLLATE_TRUE)
         if (devMode->dmFields & DM_COLLATE)
         {
             if (devMode->dmCollate == DMCOLLATE_TRUE)


@@ -441,6 +461,7 @@ void wxPrintData::ConvertFromNative()
             else
                 m_printCollate = FALSE;
         }
             else
                 m_printCollate = FALSE;
         }

+#endif

 
         //// Number of copies
 
 
         //// Number of copies
 


@@ -478,6 +499,7 @@ void wxPrintData::ConvertFromNative()
         else
             m_colour = TRUE;
 
         else
             m_colour = TRUE;
 

+#ifndef __WXWINE__

         //// Paper size
 
         if (devMode->dmFields & DM_PAPERSIZE)
         //// Paper size
 
         if (devMode->dmFields & DM_PAPERSIZE)


@@ -526,7 +548,7 @@ void wxPrintData::ConvertFromNative()
             m_paperSize.y = 0;
             m_paperId = wxPAPER_NONE;
         }
             m_paperSize.y = 0;
             m_paperId = wxPAPER_NONE;
         }

-
+#endif

 
         //// Duplex
 
 
         //// Duplex
 


@@ -716,8 +738,8 @@ void wxPrintDialogData::ConvertToNative()
 #ifdef __GNUWIN32__
         pd->lStructSize    = 66 ;
 #else
 #ifdef __GNUWIN32__
         pd->lStructSize    = 66 ;
 #else

-#endif

         pd->lStructSize    = sizeof(PRINTDLG);
         pd->lStructSize    = sizeof(PRINTDLG);

+#endif

         pd->hwndOwner      = (HWND)NULL;
         pd->hDevMode       = NULL; // Will be created by PrintDlg
         pd->hDevNames      = NULL; // Ditto
         pd->hwndOwner      = (HWND)NULL;
         pd->hDevMode       = NULL; // Will be created by PrintDlg
         pd->hDevNames      = NULL; // Ditto


@@ -1165,3 +1187,4 @@ void wxPageSetupDialogData::CalculatePaperSizeFromId()
     }
 }
 
     }
 }
 

+#endif // wxUSE_PRINTING_ARCHITECTURE