X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..d0f063020e6fb1b1a660952d0844071e0df24324:/include/wx/caret.h diff --git a/include/wx/caret.h b/include/wx/caret.h index c3d3ebd2bd..c0a30bb893 100644 --- a/include/wx/caret.h +++ b/include/wx/caret.h @@ -34,7 +34,7 @@ class WXDLLIMPEXP_FWD_CORE wxWindowBase; // appear. It can be either a solid block or a custom bitmap (TODO) // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxCaretBase +class WXDLLIMPEXP_CORE wxCaretBase { public: // ctors @@ -167,7 +167,7 @@ protected: // the common initialization void Init() { - m_window = (wxWindowBase *)NULL; + m_window = NULL; m_x = m_y = 0; m_width = m_height = 0; m_countVisible = 0; @@ -186,7 +186,7 @@ protected: int m_countVisible; private: - DECLARE_NO_COPY_CLASS(wxCaretBase) + wxDECLARE_NO_COPY_CLASS(wxCaretBase); }; // --------------------------------------------------------------------------- @@ -208,17 +208,17 @@ private: #ifdef wxHAS_CARET_USING_OVERLAYS // we don't need to hide the caret if it's rendered using overlays -class WXDLLEXPORT wxCaretSuspend +class WXDLLIMPEXP_CORE wxCaretSuspend { public: wxCaretSuspend(wxWindow *WXUNUSED(win)) {} - DECLARE_NO_COPY_CLASS(wxCaretSuspend) + wxDECLARE_NO_COPY_CLASS(wxCaretSuspend); }; #else // !wxHAS_CARET_USING_OVERLAYS -class WXDLLEXPORT wxCaretSuspend +class WXDLLIMPEXP_CORE wxCaretSuspend { public: wxCaretSuspend(wxWindow *win) @@ -242,7 +242,7 @@ private: wxCaret *m_caret; bool m_show; - DECLARE_NO_COPY_CLASS(wxCaretSuspend) + wxDECLARE_NO_COPY_CLASS(wxCaretSuspend); }; #endif // wxHAS_CARET_USING_OVERLAYS/!wxHAS_CARET_USING_OVERLAYS