diff --git a/include/wx/msw/webview_ie.h b/include/wx/msw/webview_ie.h index f1e7773f89..3a4f042c16 100644 --- a/include/wx/msw/webview_ie.h +++ b/include/wx/msw/webview_ie.h @@ -157,7 +157,6 @@ private: wxIEContainer* m_container; wxAutomationObject m_ie; IWebBrowser2* m_webBrowser; - DWORD m_dwCookie; wxCOMPtr m_uiHandler; //We store the current zoom type; diff --git a/samples/dll/sdk_exe.cpp b/samples/dll/sdk_exe.cpp index b090eb6afc..7e5c127029 100644 --- a/samples/dll/sdk_exe.cpp +++ b/samples/dll/sdk_exe.cpp @@ -82,8 +82,6 @@ LRESULT CALLBACK MainWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) default: return DefWindowProc(hwnd, msg, wParam, lParam); } - - return 0; } // ---------------------------------------------------------------------------- diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index 0c874ae457..51cf1fe9a5 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -1713,7 +1713,7 @@ void wxMSWDCImpl::SetLogicalFunction(wxRasterOperationMode function) void wxMSWDCImpl::SetRop(WXHDC dc) { - if ( !dc || m_logicalFunction < 0 ) + if ( !dc ) return; int rop; diff --git a/tests/graphics/affinematrix.cpp b/tests/graphics/affinematrix.cpp index 130c95424b..f2fbdbef67 100644 --- a/tests/graphics/affinematrix.cpp +++ b/tests/graphics/affinematrix.cpp @@ -311,7 +311,7 @@ public: m_gcdc->SetGraphicsContext(ctx); } - virtual void FlushDC() + virtual void FlushDC() wxOVERRIDE { // Apparently, flushing native Direct2D renderer // is not enough to update underlying DC (bitmap) diff --git a/tests/graphics/clippingbox.cpp b/tests/graphics/clippingbox.cpp index 87f56119e9..65ab7ab379 100644 --- a/tests/graphics/clippingbox.cpp +++ b/tests/graphics/clippingbox.cpp @@ -414,7 +414,7 @@ public: virtual ~ClippingBoxTestCaseGCDCDirect2D() {} - virtual void FlushDC() + virtual void FlushDC() wxOVERRIDE { // Apparently, flushing native Direct2D renderer // is not enough to update underlying DC (bitmap) @@ -1616,7 +1616,7 @@ public: virtual ~ClippingBoxTestCaseGCDirect2D() {} - virtual void FlushGC() + virtual void FlushGC() wxOVERRIDE { // Apparently, flushing native Direct2D renderer // is not enough to update underlying DC (bitmap) diff --git a/tests/misc/safearrayconverttest.cpp b/tests/misc/safearrayconverttest.cpp index 495245a805..96d49b1ab9 100644 --- a/tests/misc/safearrayconverttest.cpp +++ b/tests/misc/safearrayconverttest.cpp @@ -126,7 +126,7 @@ void SafeArrayConvertTestCase::VariantListReturnSafeArray() wxVariantDataSafeArray* vsa = wxStaticCastVariantData(variantCopy.GetData(), wxVariantDataSafeArray); - long bound; + long bound wxDUMMY_INITIALIZE(0); CPPUNIT_ASSERT( vsa ); CPPUNIT_ASSERT( safeArray.Attach(vsa->GetValue()) ); @@ -177,7 +177,7 @@ void SafeArrayConvertTestCase::StringsReturnSafeArray() wxVariantDataSafeArray* vsa = wxStaticCastVariantData(variant.GetData(), wxVariantDataSafeArray); - long bound; + long bound wxDUMMY_INITIALIZE(0); CPPUNIT_ASSERT( vsa ); CPPUNIT_ASSERT( safeArray.Attach(vsa->GetValue()) );