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

Eliminate -Wzero-as-null-pointer-constant warnings in the headers

Browse Source
This commit is contained in:
Paul Cornett
2020-02-02 23:40:01 -08:00
parent 948ddc6e0f
commit 05183b7099
22 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/msw/private.h
View File

@@ -162,7 +162,8 @@ protected:
// implicitly convertible to HANDLE, which is a pointer.
static HANDLE InvalidHandle()
{
return reinterpret_cast<HANDLE>(INVALID_VALUE);
wxUIntPtr h = INVALID_VALUE;
return reinterpret_cast<HANDLE>(h);
}
void DoClose()
@@ -449,7 +450,7 @@ private:
class MemoryHDC
{
public:
MemoryHDC(HDC hdc = 0) { m_hdc = ::CreateCompatibleDC(hdc); }
MemoryHDC(HDC hdc = NULL) { m_hdc = ::CreateCompatibleDC(hdc); }
~MemoryHDC() { ::DeleteDC(m_hdc); }
operator HDC() const { return m_hdc; }
@@ -483,7 +484,7 @@ public:
~SelectInHDC() { if ( m_hdc ) ::SelectObject(m_hdc, m_hgdiobj); }
// return true if the object was successfully selected
operator bool() const { return m_hgdiobj != 0; }
operator bool() const { return m_hgdiobj != NULL; }
private:
HDC m_hdc;
@@ -578,7 +579,7 @@ class MonoBitmap : public AutoHBITMAP
{
public:
MonoBitmap(int w, int h)
: AutoHBITMAP(::CreateBitmap(w, h, 1, 1, 0))
: AutoHBITMAP(::CreateBitmap(w, h, 1, 1, NULL))
{
}
};