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:
@@ -32,6 +32,11 @@
|
||||
|
||||
#include "wx/validate.h" // for wxDefaultValidator (always include it)
|
||||
|
||||
#if wxUSE_PALETTE
|
||||
#include "wx/dcclient.h"
|
||||
#include "wx/palette.h"
|
||||
#endif // wxUSE_PALETTE
|
||||
|
||||
#if wxUSE_ACCEL
|
||||
#include "wx/accel.h"
|
||||
#endif // wxUSE_ACCEL
|
||||
@@ -761,6 +766,21 @@ public:
|
||||
// platform-specific APIs
|
||||
virtual WXWidget GetHandle() const = 0;
|
||||
|
||||
#if wxUSE_PALETTE
|
||||
// Store the palette used by DCs in wxWindow so that the dcs can share
|
||||
// a palette. And we can respond to palette messages.
|
||||
wxPalette GetPalette() const { return m_palette; }
|
||||
// When palette is changed tell the DC to set the system palette to the
|
||||
// new one.
|
||||
void SetPalette(wxPalette &pal) {
|
||||
m_custompalette=true;
|
||||
m_palette=pal;
|
||||
wxWindowDC d((wxWindow *) this);
|
||||
d.SetPalette(pal);
|
||||
}
|
||||
bool HasCustomPalette() { return m_custompalette; }
|
||||
#endif // wxUSE_PALETTE
|
||||
|
||||
protected:
|
||||
// the window id - a number which uniquely identifies a window among
|
||||
// its siblings unless it is -1
|
||||
@@ -844,6 +864,11 @@ protected:
|
||||
wxString m_windowName;
|
||||
bool m_themeEnabled;
|
||||
|
||||
#ifdef wxUSE_PALETTE
|
||||
wxPalette m_palette;
|
||||
bool m_custompalette;
|
||||
#endif
|
||||
|
||||
protected:
|
||||
|
||||
// common part of all ctors: it is not virtual because it is called from
|
||||
|
Reference in New Issue
Block a user