fixed some glitches

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

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index fdb6f88075774d0f79282a413187ca15e6496c8a..872e8e4b6e232e9265e208bd14ba65c9bc0a1ead 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -198,6 +198,10 @@ wxPrintData::wxPrintData()
 
 wxPrintData::wxPrintData(const wxPrintData& printData)
 {
 
 wxPrintData::wxPrintData(const wxPrintData& printData)
 {

+#ifdef __WXMSW__
+    m_devMode = NULL;
+#endif
+

     (*this) = printData;
 }
 
     (*this) = printData;
 }
 


@@ -210,7 +214,7 @@ wxPrintData::~wxPrintData()
 #endif
 }
 
 #endif
 }
 

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

 
 static wxString wxGetPrintDlgError()
 {
 
 static wxString wxGetPrintDlgError()
 {


@@ -282,7 +286,8 @@ void wxPrintData::ConvertToNative()
                 GlobalFree(pd->hDevNames);
             pd->hDevMode = NULL;
             pd->hDevNames = NULL;
                 GlobalFree(pd->hDevNames);
             pd->hDevMode = NULL;
             pd->hDevNames = NULL;

-#ifdef __WXDEBUG__
+
+#if defined(__WXDEBUG__) && defined(__WIN32__)

             wxString str("Printing error: ");
             str += wxGetPrintDlgError();
             wxLogDebug(str);
             wxString str("Printing error: ");
             str += wxGetPrintDlgError();
             wxLogDebug(str);