msg boxes now have icons

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

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index f88c5157fddd194af5cca6e8c18a710f80215ab9..b9c2c8fc0b2a7f6708d0dd450ee6ce59a03caa1d 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -61,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>


@@ -220,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();


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

- 
-
+#endif

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


@@ -319,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
 


@@ -353,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)


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

+#endif

 
         //// Duplex
 
 
         //// Duplex
 


@@ -433,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)


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

+#endif

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


@@ -484,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)


@@ -532,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
 


@@ -722,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