X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fba05595e6cca40763f8ead119c7ad61cb01e0e4..a7689c49fe02c0c065facf736ab28b19f5997b7c:/include/wx/msw/combo.h?ds=inline diff --git a/include/wx/msw/combo.h b/include/wx/msw/combo.h index 1f99eaa935..f30bc1a309 100644 --- a/include/wx/msw/combo.h +++ b/include/wx/msw/combo.h @@ -35,7 +35,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[]; -class WXDLLEXPORT wxComboCtrl : public wxComboCtrlBase +class WXDLLIMPEXP_CORE wxComboCtrl : public wxComboCtrlBase { public: // ctors and such @@ -73,22 +73,29 @@ public: static int GetFeatures() { return wxComboCtrlFeatures::All; } #if wxUSE_COMBOCTRL_POPUP_ANIMATION - void OnTimerEvent( wxTimerEvent& event ); + void OnTimerEvent(wxTimerEvent& WXUNUSED(event)) { DoTimerEvent(); } + protected: + void DoTimerEvent(); + virtual bool AnimateShow( const wxRect& rect, int flags ); -#endif +#endif // wxUSE_COMBOCTRL_POPUP_ANIMATION protected: + // Dummy method - we override all functions that call this + virtual WXHWND GetEditHWND() const { return NULL; } + // customization virtual void OnResize(); virtual wxCoord GetNativeTextIndent() const; - virtual void OnThemeChange(); // event handlers void OnPaintEvent( wxPaintEvent& event ); void OnMouseEvent( wxMouseEvent& event ); + virtual bool HasTransparentBackground() { return IsDoubleBuffered(); } + private: void Init();