From dcc8cf5ae3a2a364774e54a70b6470c1636a9825 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Wed, 10 May 2006 17:08:45 +0000 Subject: [PATCH] correct access for virtuals git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39133 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/combo.h | 7 ++++--- include/wx/odcombo.h | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/include/wx/combo.h b/include/wx/combo.h index a1ef01b268..b5fa3955f3 100644 --- a/include/wx/combo.h +++ b/include/wx/combo.h @@ -177,9 +177,6 @@ public: virtual bool Enable(bool enable = true); virtual bool Show(bool show = true); virtual bool SetFont(const wxFont& font); -#if wxUSE_TOOLTIPS - virtual void DoSetToolTip( wxToolTip *tip ); -#endif // wxTextCtrl methods - for readonly combo they should return // without errors. @@ -404,6 +401,10 @@ protected: // Dispatches size event and refreshes void RecalcAndRefresh(); +#if wxUSE_TOOLTIPS + virtual void DoSetToolTip( wxToolTip *tip ); +#endif + // Used by OnPaints of derived classes wxBitmap& GetBufferBitmap(const wxSize& sz) const; diff --git a/include/wx/odcombo.h b/include/wx/odcombo.h index b5f65833d3..49abfd2046 100644 --- a/include/wx/odcombo.h +++ b/include/wx/odcombo.h @@ -90,9 +90,6 @@ public: // flags: wxCP_PAINTING_CONTROL is set if painting to combo control instead of list virtual void OnDrawItem( wxDC& dc, const wxRect& rect, int item, int flags ) const; - // Return item height - virtual wxCoord OnMeasureItem( size_t item ) const; - // Return item width, or -1 for calculating from text extent (default) virtual wxCoord OnMeasureItemWidth( size_t item ) const; @@ -139,6 +136,9 @@ protected: //virtual wxCoord OnMeasureItem(size_t n) const; void OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const; + // Return item height + virtual wxCoord OnMeasureItem( size_t item ) const; + // filter mouse move events happening outside the list box // move selection with cursor void OnMouseMove(wxMouseEvent& event);