Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some build warnings

Browse Source 
private field 'm_dwCookie' is not used
'return' will never be executed
result of comparison of unsigned enum expression < 0 is always false
'FlushDC' overrides a member function but is not marked 'override'
potentially uninitialized local variable 'bound' used
This commit is contained in:
Maarten Bent
2018-11-25 20:23:05 +01:00
parent bcf53d6b96
commit 3bab07edcf
6 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/msw/webview_ie.h
View File

@@ -157,7 +157,6 @@ private:
wxIEContainer* m_container; wxIEContainer* m_container;
wxAutomationObject m_ie; wxAutomationObject m_ie;
IWebBrowser2* m_webBrowser; IWebBrowser2* m_webBrowser;
DWORD m_dwCookie;
wxCOMPtr<DocHostUIHandler> m_uiHandler; wxCOMPtr<DocHostUIHandler> m_uiHandler;
//We store the current zoom type; //We store the current zoom type;

2
samples/dll/sdk_exe.cpp
View File

@@ -82,8 +82,6 @@ LRESULT CALLBACK MainWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
default: default:
return DefWindowProc(hwnd, msg, wParam, lParam); return DefWindowProc(hwnd, msg, wParam, lParam);
} }
return 0;
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

2
src/msw/dc.cpp
View File

@@ -1713,7 +1713,7 @@ void wxMSWDCImpl::SetLogicalFunction(wxRasterOperationMode function)
void wxMSWDCImpl::SetRop(WXHDC dc) void wxMSWDCImpl::SetRop(WXHDC dc)
{ {
if ( !dc || m_logicalFunction < 0 ) if ( !dc )
return; return;
int rop; int rop;

2
tests/graphics/affinematrix.cpp
View File

@@ -311,7 +311,7 @@ public:
m_gcdc->SetGraphicsContext(ctx); m_gcdc->SetGraphicsContext(ctx);
} }
virtual void FlushDC() virtual void FlushDC() wxOVERRIDE
{ {
// Apparently, flushing native Direct2D renderer // Apparently, flushing native Direct2D renderer
// is not enough to update underlying DC (bitmap) // is not enough to update underlying DC (bitmap)

4
tests/graphics/clippingbox.cpp
View File

@@ -414,7 +414,7 @@ public:
virtual ~ClippingBoxTestCaseGCDCDirect2D() {} virtual ~ClippingBoxTestCaseGCDCDirect2D() {}
virtual void FlushDC() virtual void FlushDC() wxOVERRIDE
{ {
// Apparently, flushing native Direct2D renderer // Apparently, flushing native Direct2D renderer
// is not enough to update underlying DC (bitmap) // is not enough to update underlying DC (bitmap)
@@ -1616,7 +1616,7 @@ public:
virtual ~ClippingBoxTestCaseGCDirect2D() {} virtual ~ClippingBoxTestCaseGCDirect2D() {}
virtual void FlushGC() virtual void FlushGC() wxOVERRIDE
{ {
// Apparently, flushing native Direct2D renderer // Apparently, flushing native Direct2D renderer
// is not enough to update underlying DC (bitmap) // is not enough to update underlying DC (bitmap)

4
tests/misc/safearrayconverttest.cpp
View File

@@ -126,7 +126,7 @@ void SafeArrayConvertTestCase::VariantListReturnSafeArray()
wxVariantDataSafeArray* wxVariantDataSafeArray*
vsa = wxStaticCastVariantData(variantCopy.GetData(), vsa = wxStaticCastVariantData(variantCopy.GetData(),
wxVariantDataSafeArray); wxVariantDataSafeArray);
long bound; long bound wxDUMMY_INITIALIZE(0);
CPPUNIT_ASSERT( vsa ); CPPUNIT_ASSERT( vsa );
CPPUNIT_ASSERT( safeArray.Attach(vsa->GetValue()) ); CPPUNIT_ASSERT( safeArray.Attach(vsa->GetValue()) );
@@ -177,7 +177,7 @@ void SafeArrayConvertTestCase::StringsReturnSafeArray()
wxVariantDataSafeArray* wxVariantDataSafeArray*
vsa = wxStaticCastVariantData(variant.GetData(), vsa = wxStaticCastVariantData(variant.GetData(),
wxVariantDataSafeArray); wxVariantDataSafeArray);
long bound; long bound wxDUMMY_INITIALIZE(0);
CPPUNIT_ASSERT( vsa ); CPPUNIT_ASSERT( vsa );
CPPUNIT_ASSERT( safeArray.Attach(vsa->GetValue()) ); CPPUNIT_ASSERT( safeArray.Attach(vsa->GetValue()) );