X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c475be6dfa78fed16ab88f34af16dddfb06afd08..3508c1432884472f0d24f0f98c0dc75ed35df297:/include/wx/combo.h diff --git a/include/wx/combo.h b/include/wx/combo.h index 8d8a272ffa..902c0bc5b9 100644 --- a/include/wx/combo.h +++ b/include/wx/combo.h @@ -46,8 +46,8 @@ #include "wx/renderer.h" // this is needed for wxCONTROL_XXX flags #include "wx/bitmap.h" // wxBitmap used by-value -class WXDLLIMPEXP_CORE wxTextCtrl; -class WXDLLEXPORT wxComboPopup; +class WXDLLIMPEXP_FWD_CORE wxTextCtrl; +class WXDLLIMPEXP_FWD_CORE wxComboPopup; // // New window styles for wxComboCtrlBase @@ -137,7 +137,7 @@ struct wxComboCtrlFeatures }; -class WXDLLEXPORT wxComboCtrlBase : public wxControl +class WXDLLIMPEXP_CORE wxComboCtrlBase : public wxControl { friend class wxComboPopup; public: @@ -445,7 +445,7 @@ protected: // Draws dropbutton. Using wxRenderer or bitmaps, as appropriate. // Flags are defined above. - void DrawButton( wxDC& dc, const wxRect& rect, int flags = Button_PaintBackground ); + virtual void DrawButton( wxDC& dc, const wxRect& rect, int flags = Button_PaintBackground ); // Call if cursor is on button area or mouse is captured for the button. //bool HandleButtonMouseEvent( wxMouseEvent& event, bool isInside ); @@ -645,7 +645,7 @@ enum }; -class WXDLLEXPORT wxComboPopup +class WXDLLIMPEXP_CORE wxComboPopup { friend class wxComboCtrlBase; public: