Filter index wasn't being set for multiple file dialog

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

diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp
index f93544cc421433aef66233e5d6f31c770332510d..53542de5ea305ad0c257f2203b31f4ecaab0601c 100644 (file)
--- a/src/msw/dcprint.cpp
+++ b/src/msw/dcprint.cpp
@@ -309,15 +309,10 @@ WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
     {
         // Retrieve the default device name
         wxString portName;
     {
         // 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();
     }
 
         deviceName = devNameStr.c_str();
     }
 


@@ -345,7 +340,8 @@ bool DrawBitmapUsingStretchDIBits(HDC hdc,
 {
 #if wxUSE_WXDIB
     wxDIB dib(bmp);
 {
 #if wxUSE_WXDIB
     wxDIB dib(bmp);

-    if ( !dib.IsOk() )
+    bool ok = dib.IsOk();
+    if ( !ok )

         return FALSE;
 
     DIBSECTION ds;
         return FALSE;
 
     DIBSECTION ds;