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

Use more suitable type for MSWReplaceImageHandle() parameter

Browse Source 
It's a handle, so make it a WXHANDLE rather than WXLPARAM and avoid
casting the handle when calling it (there is still a cast when calling
::SendMessage() inside this function, but this is unavoidable and this
cast was already there anyhow).

No real changes.
This commit is contained in:
Vadim Zeitlin
2021-10-21 16:34:52 +01:00
parent c1abbe6473
commit e126ddc11c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/msw/statbmp.h
View File

@@ -132,7 +132,7 @@ private:
// Replace the image at the native control level with the given HBITMAP or // Replace the image at the native control level with the given HBITMAP or
// HICON (which can be 0) and destroy the previous image if necessary. // HICON (which can be 0) and destroy the previous image if necessary.
void MSWReplaceImageHandle(WXLPARAM handle); void MSWReplaceImageHandle(WXHANDLE handle);
wxDECLARE_DYNAMIC_CLASS(wxStaticBitmap); wxDECLARE_DYNAMIC_CLASS(wxStaticBitmap);

4
src/msw/statbmp.cpp
View File

@@ -221,7 +221,7 @@ void wxStaticBitmap::DoPaintManually(wxPaintEvent& WXUNUSED(event))
true /* use mask */); true /* use mask */);
} }
void wxStaticBitmap::MSWReplaceImageHandle(WXLPARAM handle) void wxStaticBitmap::MSWReplaceImageHandle(WXHANDLE handle)
{ {
HGDIOBJ oldHandle = (HGDIOBJ)::SendMessage(GetHwnd(), STM_SETIMAGE, HGDIOBJ oldHandle = (HGDIOBJ)::SendMessage(GetHwnd(), STM_SETIMAGE,
m_icon.IsOk() ? IMAGE_ICON : IMAGE_BITMAP, (LPARAM)handle); m_icon.IsOk() ? IMAGE_ICON : IMAGE_BITMAP, (LPARAM)handle);
@@ -271,7 +271,7 @@ void wxStaticBitmap::DoUpdateImage(const wxSize& sizeOld, bool wasIcon)
.TurnOn(isIcon ? SS_ICON : SS_BITMAP); .TurnOn(isIcon ? SS_ICON : SS_BITMAP);
} }
MSWReplaceImageHandle((WXLPARAM)handle); MSWReplaceImageHandle(handle);
m_currentHandle = (WXHANDLE)handle; m_currentHandle = (WXHANDLE)handle;
m_ownsCurrentHandle = handle != handleOrig; m_ownsCurrentHandle = handle != handleOrig;