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

Avoid ugly casts to wxMemoryDC

Browse Source
This commit is contained in:
Maarten Bent
2020-06-07 19:14:05 +02:00
parent 379cff7d19
commit 71773d40ab
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/stc/PlatWX.cpp
View File

@@ -293,11 +293,11 @@ void SurfaceImpl::Init(SurfaceID hdc_, WindowID) {
void SurfaceImpl::InitPixMap(int width, int height, Surface *surface, WindowID winid) { void SurfaceImpl::InitPixMap(int width, int height, Surface *surface, WindowID winid) {
Release(); Release();
if (surface) wxMemoryDC* mdc = surface
hdc = new wxMemoryDC(static_cast<SurfaceImpl*>(surface)->hdc); ? new wxMemoryDC(static_cast<SurfaceImpl*>(surface)->hdc)
else : new wxMemoryDC();
hdc = new wxMemoryDC(); mdc->GetImpl()->SetWindow(GETWIN(winid));
((wxMemoryDC*)hdc)->GetImpl()->SetWindow(GETWIN(winid)); hdc = mdc;
hdcOwned = true; hdcOwned = true;
if (width < 1) width = 1; if (width < 1) width = 1;
if (height < 1) height = 1; if (height < 1) height = 1;
@@ -307,7 +307,7 @@ void SurfaceImpl::InitPixMap(int width, int height, Surface *surface, WindowID w
bitmap = new wxBitmap(); bitmap = new wxBitmap();
bitmap->CreateScaled(width, height,wxBITMAP_SCREEN_DEPTH,(GETWIN(winid))->GetContentScaleFactor()); bitmap->CreateScaled(width, height,wxBITMAP_SCREEN_DEPTH,(GETWIN(winid))->GetContentScaleFactor());
#endif #endif
((wxMemoryDC*)hdc)->SelectObject(*bitmap); mdc->SelectObject(*bitmap);
} }