Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2025-12-15 17:20:07 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

WXMSW: use HandleToLong/LongToHandle functions.

Browse Source 
On Clang++, casting from a pointer to an integer of a smaller size is
considered an error.  In cases where Windows HANDLEs are converted
to/from longs, use the Windows-provided conversion functions
HandleToLong and LongToHandle.

In a couple of cases, a pointer is being cast to long in a __hash__
function.  These don't seem Windows-specific so it is not safe to assume
the Windows conversion functions are present.  In those cases, fall back
to the (ugly) double-casting that the Windows functions contain.
This commit is contained in:
Jeremy Drake
2021-06-14 11:43:29 -07:00
parent 64e5d863f7
commit 31e6c8ed34
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
etg/bitmap.py
View File

@@ -106,7 +106,7 @@ def run():
doc='MSW-only method to fetch the windows handle for the bitmap.',
body="""\
#ifdef __WXMSW__
return (long)self->GetHandle();
return HandleToLong(self->GetHandle());
#else
return 0;
#endif
@@ -116,7 +116,7 @@ def run():
doc='MSW-only method to set the windows handle for the bitmap.',
body="""\
#ifdef __WXMSW__
self->SetHandle((WXHANDLE)handle);
self->SetHandle((WXHANDLE)LongToHandle(handle));
#endif
""")

4
etg/cursor.py
View File

@@ -51,7 +51,7 @@ def run():
c.addCppMethod('long', 'GetHandle', '()', """\
#ifdef __WXMSW__
return (long)self->GetHandle();
return HandleToLong(self->GetHandle());
#else
return 0;
#endif""",
@@ -59,7 +59,7 @@ def run():
c.addCppMethod('void', 'SetHandle', '(long handle)', """\
#ifdef __WXMSW__
self->SetHandle((WXHANDLE)handle);
self->SetHandle((WXHANDLE)LongToHandle(handle));
#endif""",
briefDoc="Set the handle to use for this Cursor. Windows only.")

2
etg/dataview.py
View File

@@ -82,7 +82,7 @@ def run():
c.addCppMethod('int', '__nonzero__', '()', "return self->IsOk();")
c.addCppMethod('int', '__bool__', '()', "return self->IsOk();")
c.addCppMethod('long', '__hash__', '()', "return (long)self->GetID();")
c.addCppMethod('long', '__hash__', '()', "return (long)(intptr_t)self->GetID();")
c.addCppMethod('bool', '__eq__', '(wxDataViewItem* other)',
"return other ? (self->GetID() == other->GetID()) : false;")

2
etg/dc.py
View File

@@ -257,7 +257,7 @@ def run():
c.addCppMethod('long', 'GetHDC', '()', """\
#ifdef __WXMSW__
return (long)self->GetHandle();
return HandleToLong(self->GetHandle());
#else
wxPyRaiseNotImplemented();
return 0;

6
etg/icon.py
View File

@@ -56,7 +56,7 @@ def run():
c.addCppMethod('long', 'GetHandle', '()', """\
#ifdef __WXMSW__
return (long)self->GetHandle();
return HandleToLong(self->GetHandle());
#else
return 0;
#endif
@@ -64,7 +64,7 @@ def run():
c.addCppMethod('void', 'SetHandle', '(long handle)', """\
#ifdef __WXMSW__
self->SetHandle((WXHANDLE)handle);
self->SetHandle((WXHANDLE)LongToHandle(handle));
#endif
""")
@@ -73,7 +73,7 @@ def run():
doc='MSW-only method to create a wx.Icon from a native icon handle.',
body="""\
#ifdef __WXMSW__
return self->CreateFromHICON((WXHICON)hicon);
return self->CreateFromHICON((WXHICON)LongToHandle(hicon));
#else
return false;
#endif

2
etg/treelist.py
View File

@@ -47,7 +47,7 @@ def run():
c.addCppMethod('int', '__bool__', '()', "return self->IsOk();")
c.addCppMethod('long', '__hash__', '()', """\
return (long)self->GetID();
return (long)(intptr_t)self->GetID();
""")
c.addCppMethod('bool', '__eq__', '(wxTreeListItem* other)',