Getting various compilers to work with wxWin again

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/cmndata.cpp

@@ -225,8 +225,9 @@ wxPrintData::~wxPrintData()
 #endif
 }
 
-#if defined(__WXMSW__) && defined(__WIN32__)
+#if defined(__WXMSW__) // && defined(__WIN32__)
 
+#ifdef __WIN32__
 static wxString wxGetPrintDlgError()
 {
     DWORD err = CommDlgExtendedError();
@@ -259,8 +260,7 @@ static wxString wxGetPrintDlgError()
     }
     return msg;
 }
- 
-
+#endif
 
 void wxPrintData::ConvertToNative()
 {
@@ -331,8 +331,10 @@ void wxPrintData::ConvertToNative()
 
         //// Collation
 
+#ifndef __WIN16__
         devMode->dmCollate = (m_printCollate ? DMCOLLATE_TRUE : DMCOLLATE_FALSE);
         devMode->dmFields |= DM_COLLATE;
+#endif
 
         //// Number of copies
 
@@ -451,6 +453,7 @@ void wxPrintData::ConvertFromNative()
 
         //// Collation
 
+#ifndef __WIN16__
         if (devMode->dmFields & DM_COLLATE)
         {
             if (devMode->dmCollate == DMCOLLATE_TRUE)
@@ -458,6 +461,7 @@ void wxPrintData::ConvertFromNative()
             else
                 m_printCollate = FALSE;
         }
+#endif
 
         //// Number of copies
 
@@ -734,8 +738,8 @@ void wxPrintDialogData::ConvertToNative()
 #ifdef __GNUWIN32__
         pd->lStructSize    = 66 ;
 #else
-#endif
         pd->lStructSize    = sizeof(PRINTDLG);
+#endif
         pd->hwndOwner      = (HWND)NULL;
         pd->hDevMode       = NULL; // Will be created by PrintDlg
         pd->hDevNames      = NULL; // Ditto