AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

moved ProvidesBackground() from wxUniv to base wxWindow class; use it to prevent inheriting background brush beyond the windows which normally have their own background

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2004-12-19 20:51:06 +00:00
parent 24cb401947
commit 4cc4e7b6cc
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/bookctrl.h
View File

@ -179,8 +179,10 @@ public:
} }
} }
// override some base class virtuals
virtual void ApplyParentThemeBackground(const wxColour& bg) virtual void ApplyParentThemeBackground(const wxColour& bg)
{ SetBackgroundColour(bg); } { SetBackgroundColour(bg); }
virtual bool ProvidesBackground() const { return true; }
protected: protected:
// remove the page and return a pointer to it // remove the page and return a pointer to it

1
include/wx/toplevel.h
View File

@ -191,6 +191,7 @@ public:
virtual bool Destroy(); virtual bool Destroy();
virtual bool IsTopLevel() const { return true; } virtual bool IsTopLevel() const { return true; }
virtual wxSize GetMaxSize() const; virtual wxSize GetMaxSize() const;
virtual bool ProvidesBackground() const { return true; }
// event handlers // event handlers
void OnCloseWindow(wxCloseEvent& event); void OnCloseWindow(wxCloseEvent& event);

2
include/wx/univ/toplevel.h
View File

@ -143,8 +143,6 @@ public:
virtual int GetMinWidth() const; virtual int GetMinWidth() const;
virtual int GetMinHeight() const; virtual int GetMinHeight() const;
virtual bool ProvidesBackground() const { return true; }
protected: protected:
// handle titlebar button click event // handle titlebar button click event
virtual void ClickTitleBarButton(long button); virtual void ClickTitleBarButton(long button);

5
include/wx/univ/window.h
View File

@ -149,11 +149,6 @@ public:
// be adapted from a parent window // be adapted from a parent window
virtual bool HasTransparentBackground() { return false; } virtual bool HasTransparentBackground() { return false; }
// to be used with function above: transparent windows get
// their background from parents that return true here,
// so this is mostly for wxPanel, wxTopLevelWindow etc.
virtual bool ProvidesBackground() const { return false; }
// return true if this control can be highlighted when the mouse is over // return true if this control can be highlighted when the mouse is over
// it (the theme decides itself whether it is really highlighted or not) // it (the theme decides itself whether it is really highlighted or not)
virtual bool CanBeHighlighted() const { return false; } virtual bool CanBeHighlighted() const { return false; }

7
include/wx/window.h
View File

@ -757,6 +757,13 @@ public:
} }
wxColour GetBackgroundColour() const; wxColour GetBackgroundColour() const;
// if the window shouldn't inherit its colour from the parent, override
// this function to return true
//
// this is currently only used by wxMSW and wxUniv but should be useful for
// the other ports too
virtual bool ProvidesBackground() const { return false; }
virtual bool SetForegroundColour(const wxColour& colour); virtual bool SetForegroundColour(const wxColour& colour);
void SetOwnForegroundColour(const wxColour& colour) void SetOwnForegroundColour(const wxColour& colour)
{ {