X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d34e375c9c54f7fc655de69591dee4d5f8bb7193..660296aa90ad5ecc98c585cc24567cee8130499a:/include/wx/msw/control.h diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h index 960c3a9948..ab32c80c76 100644 --- a/include/wx/msw/control.h +++ b/include/wx/msw/control.h @@ -81,7 +81,7 @@ protected: // In wxMSW it was only wxSpinCtrl derived from wxSpinButton but in // WinCE of Smartphones this happens also for native wxTextCtrl, // wxChoice and others. - virtual wxSize GetBestSpinerSize(const bool is_vertical) const; + virtual wxSize GetBestSpinnerSize(const bool is_vertical) const; // create the control of the given Windows class: this is typically called // from Create() method of the derived class passing its label, pos and @@ -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 + virtual 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