Use correct bitmap size on Mac
This commit is contained in:
@@ -75,7 +75,7 @@ wxSplashScreen::wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int mil
|
|||||||
|
|
||||||
m_window = new wxSplashScreenWindow(bitmap, this, wxID_ANY, pos, size, wxNO_BORDER);
|
m_window = new wxSplashScreenWindow(bitmap, this, wxID_ANY, pos, size, wxNO_BORDER);
|
||||||
|
|
||||||
SetClientSize(bitmap.GetWidth(), bitmap.GetHeight());
|
SetClientSize(bitmap.GetScaledWidth(), bitmap.GetScaledHeight());
|
||||||
|
|
||||||
if (m_splashStyle & wxSPLASH_CENTRE_ON_PARENT)
|
if (m_splashStyle & wxSPLASH_CENTRE_ON_PARENT)
|
||||||
CentreOnParent();
|
CentreOnParent();
|
||||||
@@ -176,7 +176,7 @@ static void wxDrawSplashBitmap(wxDC& dc, const wxBitmap& bitmap, int WXUNUSED(x)
|
|||||||
#endif // USE_PALETTE_IN_SPLASH
|
#endif // USE_PALETTE_IN_SPLASH
|
||||||
|
|
||||||
dcMem.SelectObjectAsSource(bitmap);
|
dcMem.SelectObjectAsSource(bitmap);
|
||||||
dc.Blit(0, 0, bitmap.GetWidth(), bitmap.GetHeight(), &dcMem, 0, 0, wxCOPY,
|
dc.Blit(0, 0, bitmap.GetScaledWidth(), bitmap.GetScaledHeight(), &dcMem, 0, 0, wxCOPY,
|
||||||
true /* use mask */);
|
true /* use mask */);
|
||||||
dcMem.SelectObject(wxNullBitmap);
|
dcMem.SelectObject(wxNullBitmap);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user