Less MSW related files in wxPalmOS port.

[wxWidgets.git] / include / wx / msw / control.h

diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h
index 960c3a994871eea29bfa5aeb19cf5f50d8658742..70ce2da88df26b02546772710ba0e4361b131bb8 100644 (file)
--- a/include/wx/msw/control.h
+++ b/include/wx/msw/control.h
@@ -120,18 +120,20 @@ protected:
     virtual WXHBRUSH MSWControlColor(WXHDC pDC);
 
     // call this from the derived class MSWControlColor() if you want to show
-    // the control greyed out
+    // the control greyed out (and opaque)
     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());
+        return DoMSWControlColor(pDC, GetBackgroundColour());
     }
 
-    // common part of the 3 methods above
-    WXHBRUSH MSWControlColorSolid(WXHDC pDC, wxColour colBg);
+    // common part of the 3 functions above: pass wxNullColour to use the
+    // appropriate background colour (meaning ours or our parents) or a fixed
+    // one
+    WXHBRUSH DoMSWControlColor(WXHDC pDC, wxColour colBg);
 
     // another WM_CTLCOLOR-related function: override this to return the brush
     // which should be used to paint the control background by default