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 c0e90e3d2ce058386ce152ec7271729e87655311..53542de5ea305ad0c257f2203b31f4ecaab0601c 100644 (file)
--- a/src/msw/dcprint.cpp
+++ b/src/msw/dcprint.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "dcprint.h"
 #endif
 
     #pragma implementation "dcprint.h"
 #endif
 


@@ -38,7 +38,11 @@
 #if wxUSE_PRINTING_ARCHITECTURE
 
 #include "wx/msw/private.h"
 #if wxUSE_PRINTING_ARCHITECTURE
 
 #include "wx/msw/private.h"

+
+#if wxUSE_WXDIB

 #include "wx/msw/dib.h"
 #include "wx/msw/dib.h"

+#endif
+

 #include "wx/dcprint.h"
 #include "math.h"
 
 #include "wx/dcprint.h"
 #include "math.h"
 


@@ -225,7 +229,6 @@ static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName)
     deviceName.clear();
 
     LPDEVNAMES  lpDevNames;
     deviceName.clear();
 
     LPDEVNAMES  lpDevNames;

-    LPTSTR      lpszDriverName;

     LPTSTR      lpszDeviceName;
     LPTSTR      lpszPortName;
 
     LPTSTR      lpszDeviceName;
     LPTSTR      lpszPortName;
 


@@ -259,7 +262,6 @@ static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName)
     if (pd.hDevNames)
     {
         lpDevNames = (LPDEVNAMES)GlobalLock(pd.hDevNames);
     if (pd.hDevNames)
     {
         lpDevNames = (LPDEVNAMES)GlobalLock(pd.hDevNames);

-        lpszDriverName = (LPTSTR)lpDevNames + lpDevNames->wDriverOffset;

         lpszDeviceName = (LPTSTR)lpDevNames + lpDevNames->wDeviceOffset;
         lpszPortName   = (LPTSTR)lpDevNames + lpDevNames->wOutputOffset;
 
         lpszDeviceName = (LPTSTR)lpDevNames + lpDevNames->wDeviceOffset;
         lpszPortName   = (LPTSTR)lpDevNames + lpDevNames->wOutputOffset;
 


@@ -276,7 +278,7 @@ static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName)
         GlobalFree(pd.hDevMode);
         pd.hDevMode=NULL;
     }
         GlobalFree(pd.hDevMode);
         pd.hDevMode=NULL;
     }

-    return ( deviceName != wxT("") );
+    return ( deviceName != wxEmptyString );

 }
 
 // Gets an HDC for the specified printer configuration
 }
 
 // Gets an HDC for the specified printer configuration


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


@@ -341,8 +338,10 @@ bool DrawBitmapUsingStretchDIBits(HDC hdc,
                                   const wxBitmap& bmp,
                                   wxCoord x, wxCoord y)
 {
                                   const wxBitmap& bmp,
                                   wxCoord x, wxCoord y)
 {

+#if wxUSE_WXDIB

     wxDIB dib(bmp);
     wxDIB dib(bmp);

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

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


@@ -373,6 +372,9 @@ bool DrawBitmapUsingStretchDIBits(HDC hdc,
     }
 
     return TRUE;
     }
 
     return TRUE;

+#else
+    return FALSE;
+#endif

 }
 
 void wxPrinterDC::DoDrawBitmap(const wxBitmap& bmp,
 }
 
 void wxPrinterDC::DoDrawBitmap(const wxBitmap& bmp,


@@ -400,7 +402,7 @@ void wxPrinterDC::DoDrawBitmap(const wxBitmap& bmp,
 bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest,
                          wxCoord width, wxCoord height,
                          wxDC *source,
 bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest,
                          wxCoord width, wxCoord height,
                          wxDC *source,

-                         wxCoord xsrc, wxCoord ysrc,
+                         wxCoord WXUNUSED(xsrc), wxCoord WXUNUSED(ysrc),

                          int WXUNUSED(rop), bool useMask,
                          wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask))
 {
                          int WXUNUSED(rop), bool useMask,
                          wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask))
 {