make sure we are comparing the stripped strings

[wxWidgets.git] / src / msw / dcprint.cpp

diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp
index 17b5533defaeb76c07886a9cad15d8c7a5e406bb..819514bb60cd22b6b5681589547883c12d7673a4 100644 (file)
--- a/src/msw/dcprint.cpp
+++ b/src/msw/dcprint.cpp
@@ -195,13 +195,11 @@ bool wxPrinterDC::StartDoc(const wxString& message)
 
     int ret = ::StartDoc(GetHdc(), &docinfo);
 
-#ifndef __WIN16__
     if (ret <= 0)
     {
         DWORD lastError = GetLastError();
         wxLogDebug(wxT("wxDC::StartDoc failed with error: %ld\n"), lastError);
     }
-#endif
 
     return (ret > 0);
 }
@@ -309,15 +307,10 @@ WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
     {
         // Retrieve the default device name
         wxString portName;
-#ifdef  __WXDEBUG__
-        bool ret =
-#else   // !Debug
-        (void)
-#endif // Debug/Release
-        wxGetDefaultDeviceName(devNameStr, portName);
-
-        wxASSERT_MSG( ret, wxT("Could not get default device name.") );
-
+        if ( !wxGetDefaultDeviceName(devNameStr, portName) )
+        {
+            return 0; // Could not get default device name
+        }
         deviceName = devNameStr.c_str();
     }
 
@@ -375,7 +368,7 @@ bool DrawBitmapUsingStretchDIBits(HDC hdc,
 
         return FALSE;
     }
-    else
+
     return TRUE;
 #else
     return FALSE;