From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 19 Nov 2004 20:35:41 +0000 (+0000)
Subject: added MSWControlColorDisabled and MSWControlColorSolid
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/a8da30af840c5fac01f17eb822d479b0485ac4b0

added MSWControlColorDisabled and MSWControlColorSolid


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h
index e3669c8c08..574d84a74b 100644
--- a/include/wx/msw/control.h
+++ b/include/wx/msw/control.h
@@ -70,8 +70,6 @@ public:
 
     const wxArrayLong& GetSubcontrols() const { return m_subControls; }
 
-    virtual WXHBRUSH MSWControlColor(WXHDC pDC);
-
 protected:
     // choose the default border for this window
     virtual wxBorder GetDefaultBorder() const;
@@ -118,6 +116,23 @@ protected:
     // default style for the control include WS_TABSTOP if it AcceptsFocus()
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
+    // default handling of WM_CTLCOLORxxx
+    virtual WXHBRUSH MSWControlColor(WXHDC pDC);
+
+    // call this from the derived class MSWControlColor() if you want to show
+    // the control greyed out
+    WXHBRUSH MSWControlColorDisabled(WXHDC pDC);
+
+    // call this from the derived class MSWControlColor() if you want to always
+    // paint the background (as all opaque controls do)
+    WXHBRUSH MSWControlColorSolid(WXHDC pDC)
+    {
+        return MSWControlColorSolid(pDC, GetBackgroundColour());
+    }
+
+    // common part of the 3 methods above
+    WXHBRUSH MSWControlColorSolid(WXHDC pDC, wxColour colBg);
+
     // this is a helper for the derived class GetClassDefaultAttributes()
     // implementation: it returns the right colours for the classes which
     // contain something else (e.g. wxListBox, wxTextCtrl, ...) instead of