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

Changed CanApplyParentThemeBackground to ApplyParentThemeBackground

Browse Source 
and let the windows set the the background colour themselves (or not)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-03-05 05:28:21 +00:00
parent 8eca4fef10
commit cc0bffaceb
17 changed files with 41 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/bmpbuttn.h
View File

@@ -61,7 +61,9 @@ public:
int GetMarginX() const { return m_marginX; }
int GetMarginY() const { return m_marginY; }
virtual bool CanApplyParentThemeBackground() const { return true; }
virtual void ApplyParentThemeBackground(const wxColour& bg)
{ SetBackgroundColour(bg); }
protected:
// function called when any of the bitmaps changes

3
include/wx/bookctrl.h
View File

@@ -161,6 +161,9 @@ public:
}
}
virtual void ApplyParentThemeBackground(const wxColour& bg)
{ SetBackgroundColour(bg); }
protected:
// remove the page and return a pointer to it
virtual wxWindow *DoRemovePage(size_t page) = 0;

3
include/wx/checkbox.h
View File

@@ -106,7 +106,8 @@ public:
return HasFlag(wxCHK_ALLOW_3RD_STATE_FOR_USER);
}
virtual bool CanApplyParentThemeBackground() const { return true; }
virtual void ApplyParentThemeBackground(const wxColour& bg)
{ SetBackgroundColour(bg); }
protected:
virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state)) { wxFAIL; }

4
include/wx/generic/panelg.h
View File

@@ -86,7 +86,9 @@ public:
virtual bool ProvidesBackground() const { return TRUE; }
#endif
virtual bool CanApplyParentThemeBackground() const { return true; }
virtual void ApplyParentThemeBackground(const wxColour& bg)
{ SetBackgroundColour(bg); }
WX_DECLARE_CONTROL_CONTAINER();

3
include/wx/html/htmlwin.h
View File

@@ -198,7 +198,8 @@ public:
void SelectAll();
#endif
virtual bool CanApplyParentThemeBackground() const { return false; }
virtual void ApplyParentThemeBackground(const wxColour& WXUNUSED(bg))
{ /* do nothing */ }
protected:
void Init();

6
include/wx/msw/button.h
View File

@@ -54,6 +54,12 @@ public:
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
virtual bool MSWCommand(WXUINT param, WXWORD id);
virtual void ApplyParentThemeBackground(const wxColour& bg)
{
// avoide switching into owner-drawn mode
wxControl::SetBackgroundColour(bg);
}
#ifdef __WIN32__
// coloured buttons support
virtual bool SetBackgroundColour(const wxColour &colour);

3
include/wx/msw/radiobox.h
View File

@@ -124,6 +124,9 @@ public:
int GetNumVer() const;
int GetNumHor() const;
virtual void ApplyParentThemeBackground(const wxColour& bg)
{ SetBackgroundColour(bg); }
protected:
// subclass one radio button
void SubclassRadioButton(WXHWND hWndBtn);

4
include/wx/msw/radiobut.h
View File

@@ -52,7 +52,9 @@ public:
// implementation only from now on
virtual bool MSWCommand(WXUINT param, WXWORD id);
virtual void Command(wxCommandEvent& event);
virtual bool CanApplyParentThemeBackground() const { return true; }
virtual void ApplyParentThemeBackground(const wxColour& bg)
{ SetBackgroundColour(bg); }
protected:
virtual wxSize DoGetBestSize() const;

1
include/wx/notebook.h
View File

@@ -86,7 +86,6 @@ public:
// implement some base class functions
virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const;
virtual bool CanApplyParentThemeBackground() const { return true; }
protected:
DECLARE_NO_COPY_CLASS(wxNotebookBase)

2
include/wx/radiobox.h
View File

@@ -86,8 +86,6 @@ public:
// return the item above/below/to the left/right of the given one
int GetNextItem(int item, wxDirection dir, long style) const;
virtual bool CanApplyParentThemeBackground() const { return true; }
// for compatibility only, don't use these methods in new code!
#if WXWIN_COMPATIBILITY_2_2
int Number() const { return GetCount(); }

4
include/wx/slider.h
View File

@@ -81,7 +81,9 @@ public:
virtual void SetSelection(int WXUNUSED(min), int WXUNUSED(max)) { }
virtual bool CanApplyParentThemeBackground() const { return true; }
virtual void ApplyParentThemeBackground(const wxColour& bg)
{ SetBackgroundColour(bg); }
private:
DECLARE_NO_COPY_CLASS(wxSliderBase)

3
include/wx/statbox.h
View File

@@ -18,7 +18,8 @@ public:
// overriden base class virtuals
virtual bool AcceptsFocus() const { return false; }
virtual bool CanApplyParentThemeBackground() const { return true; }
virtual void ApplyParentThemeBackground(const wxColour& bg)
{ SetBackgroundColour(bg); }
private:
DECLARE_NO_COPY_CLASS(wxStaticBoxBase)

3
include/wx/statline.h
View File

@@ -48,7 +48,8 @@ public:
// overriden base class virtuals
virtual bool AcceptsFocus() const { return false; }
virtual bool CanApplyParentThemeBackground() const { return true; }
virtual void ApplyParentThemeBackground(const wxColour& bg)
{ SetBackgroundColour(bg); }
protected:
// set the right size for the right dimension

3
include/wx/stattext.h
View File

@@ -14,7 +14,8 @@ public:
// overriden base virtuals
virtual bool AcceptsFocus() const { return false; }
virtual bool CanApplyParentThemeBackground() const { return true; }
virtual void ApplyParentThemeBackground(const wxColour& bg)
{ SetBackgroundColour(bg); }
private:
DECLARE_NO_COPY_CLASS(wxStaticTextBase)

4
include/wx/vlbox.h
View File

@@ -189,7 +189,9 @@ public:
void SetSelectionBackground(const wxColour& col);
virtual bool CanApplyParentThemeBackground() const { return false; }
virtual void ApplyParentThemeBackground(const wxColour& WXUNUSED(bg))
{ /* do nothing */ }
protected:
// the derived class must implement this function to actually draw the item

3
include/wx/window.h
View File

@@ -399,7 +399,8 @@ public:
// page is added to a notebook it and it's children may need to have
// the colours adjusted depending on the current theme settings, but
// not all windows/controls can do this without looking wrong.
virtual bool CanApplyParentThemeBackground() const { return false; }
virtual void ApplyParentThemeBackground(const wxColour& WXUNUSED(bg))
{ /* do nothing */ }
// returns true if this window should inherit its parent colours on
// creation

14
src/msw/notebook.cpp
View File

@@ -966,19 +966,9 @@ void wxNotebook::ApplyThemeBackground(wxWindow*, const wxColour&)
#endif
{
#if wxUSE_UXTHEME
// Special case for wxButton: Don't set the background for buttons since
// this will switch it into ownerdraw mode
if (window->IsKindOf(CLASSINFO(wxButton)) && !window->IsKindOf(CLASSINFO(wxBitmapButton)))
// This is essential, otherwise you'll see dark grey
// corners in the buttons.
((wxButton*)window)->wxControl::SetBackgroundColour(colour);
// for all other classes let them decide
else if ((window != this) && window->CanApplyParentThemeBackground())
{
window->SetBackgroundColour(colour);
}
window->ApplyParentThemeBackground(colour);
for ( wxWindowList::compatibility_iterator node = window->GetChildren().GetFirst(); node; node = node->GetNext() )
{
wxWindow *child = node->GetData();