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

Don't use deprecated SetHBITMAP() method

Browse Source 
Inside wxBitmap we have a direct access to wxBitampData so HBITMAP can be stored directly in this structure and there is no need to call SetHBITMAP() function.
This commit is contained in:
Artur Wieczorek
2018-09-11 21:55:43 +02:00
parent 26ee45e4a5
commit 5b1aa5bb9c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/msw/bitmap.cpp
View File

@@ -710,7 +710,7 @@ wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
free(data); free(data);
} }
SetHBITMAP((WXHBITMAP)hbmp); refData->m_handle = (WXHANDLE)hbmp;
} }
wxBitmap::wxBitmap(int w, int h, const wxDC& dc) wxBitmap::wxBitmap(int w, int h, const wxDC& dc)
@@ -805,7 +805,7 @@ bool wxBitmap::DoCreate(int w, int h, int d, WXHDC hdc)
#endif // !ALWAYS_USE_DIB #endif // !ALWAYS_USE_DIB
} }
SetHBITMAP((WXHBITMAP)hbmp); GetBitmapData()->m_handle = (WXHANDLE)hbmp;
return IsOk(); return IsOk();
} }
@@ -898,7 +898,7 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth, WXHDC hdc)
#endif // !ALWAYS_USE_DIB #endif // !ALWAYS_USE_DIB
// validate this object // validate this object
SetHBITMAP((WXHBITMAP)hbitmap); refData->m_handle = (WXHANDLE)hbitmap;
// finally also set the mask if we have one // finally also set the mask if we have one
if ( image.HasMask() ) if ( image.HasMask() )