Merges from Scitech Branch (George Davison):
Added wxDisplayChangedEvent and triggering in MSW, when display mode changes this event gets triggered. I don't know what should happen with other OS's since I am not familiar with how they handle mode changes. Watcome Version 11 now compiles with wide character support. Fixed watcom warnings in html/htmlwin.h imagbmp.h listctrl.h imagbmp.cpp quantize.cpp strconv.cpp variant.cpp dirctrlg.cpp treectlg.cpp m_style.cpp fontenum.cpp listctrl.cpp ole\dataobj.cpp textctrl.cpp window.cpp xml.cpp msw/setup.h with watcom version 11 it now compiles with wide character support. xrc/xml.cpp fixed memory leak and compile warnings git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -108,6 +108,16 @@ wxSplashScreenWindow::wxSplashScreenWindow(const wxBitmap& bitmap, wxWindow* par
|
||||
wxWindow(parent, id, pos, size, style)
|
||||
{
|
||||
m_bitmap = bitmap;
|
||||
|
||||
#ifndef __WXGTK__
|
||||
bool hiColour = (wxDisplayDepth() >= 16) ;
|
||||
|
||||
if (bitmap.GetPalette() && !hiColour)
|
||||
{
|
||||
SetPalette(* bitmap.GetPalette());
|
||||
}
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
void wxSplashScreenWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
|
||||
@@ -131,7 +141,6 @@ static void wxDrawSplashBitmap(wxDC& dc, const wxBitmap& bitmap, int WXUNUSED(x)
|
||||
|
||||
if (bitmap.GetPalette() && !hiColour)
|
||||
{
|
||||
dc.SetPalette(* bitmap.GetPalette());
|
||||
dcMem.SetPalette(* bitmap.GetPalette());
|
||||
}
|
||||
#endif // USE_PALETTE_IN_SPLASH
|
||||
@@ -143,7 +152,6 @@ static void wxDrawSplashBitmap(wxDC& dc, const wxBitmap& bitmap, int WXUNUSED(x)
|
||||
#ifdef USE_PALETTE_IN_SPLASH
|
||||
if (bitmap.GetPalette() && !hiColour)
|
||||
{
|
||||
dc.SetPalette(wxNullPalette);
|
||||
dcMem.SetPalette(wxNullPalette);
|
||||
}
|
||||
#endif // USE_PALETTE_IN_SPLASH
|
||||
|
Reference in New Issue
Block a user