X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9717bd5d8ff2e3ff91d99d44850b1d2485f5edf..db7035e48a4ccc6265fa01949cb92db3c6b6c17f:/include/wx/msw/combobox.h?ds=sidebyside diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h index 6b53f6835e..2b888f9207 100644 --- a/include/wx/msw/combobox.h +++ b/include/wx/msw/combobox.h @@ -109,17 +109,13 @@ public: void OnUpdateDelete(wxUpdateUIEvent& event); void OnUpdateSelectAll(wxUpdateUIEvent& event); -protected: virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; +protected: #if wxUSE_TOOLTIPS virtual void DoSetToolTip(wxToolTip *tip); #endif - // this is the overridden wxTextEntry method which should only be called - // when we do have an edit control so it asserts if this is not the case - virtual WXHWND GetEditHWND() const; - // this is the implementation of GetEditHWND() which can also be used when // we don't have the edit control, it simply returns NULL then // @@ -130,6 +126,10 @@ protected: WXHWND GetEditHWNDIfAvailable() const; private: + // this is the overridden wxTextEntry method which should only be called + // when we do have an edit control so it asserts if this is not the case + virtual WXHWND GetEditHWND() const; + DECLARE_DYNAMIC_CLASS_NO_COPY(wxComboBox) DECLARE_EVENT_TABLE() };