X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2eb10e2a17a02acaaa32a41304243999f3a862a1..e4a8a172020d5e3ee08660420142e702799c7878:/src/msw/dcprint.cpp?ds=sidebyside diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp index c0f9a2c097..f277ca44b8 100644 --- a/src/msw/dcprint.cpp +++ b/src/msw/dcprint.cpp @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "dcprint.h" #endif @@ -229,7 +229,6 @@ static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName) deviceName.clear(); LPDEVNAMES lpDevNames; - LPTSTR lpszDriverName; LPTSTR lpszDeviceName; LPTSTR lpszPortName; @@ -263,7 +262,6 @@ static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName) if (pd.hDevNames) { lpDevNames = (LPDEVNAMES)GlobalLock(pd.hDevNames); - lpszDriverName = (LPTSTR)lpDevNames + lpDevNames->wDriverOffset; lpszDeviceName = (LPTSTR)lpDevNames + lpDevNames->wDeviceOffset; lpszPortName = (LPTSTR)lpDevNames + lpDevNames->wOutputOffset; @@ -347,7 +345,8 @@ bool DrawBitmapUsingStretchDIBits(HDC hdc, { #if wxUSE_WXDIB wxDIB dib(bmp); - if ( !dib.IsOk() ) + bool ok = dib.IsOk(); + if ( !ok ) return FALSE; DIBSECTION ds;