X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/30c841c84dce46690499567141b98ffcf5a61b6a..d642db66a5efc82d374b813022c72ba88bc50839:/include/wx/caret.h

diff --git a/include/wx/caret.h b/include/wx/caret.h
index 3b94c92604..1c28b6df2c 100644
--- a/include/wx/caret.h
+++ b/include/wx/caret.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        caret.h
+// Name:        wx/caret.h
 // Purpose:     wxCaretBase class - the interface of wxCaret
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -20,8 +20,8 @@
 // forward declarations
 // ---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxWindow;
-class WXDLLEXPORT wxWindowBase;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxWindowBase;
 
 // ----------------------------------------------------------------------------
 // headers we have to include
@@ -34,7 +34,7 @@ class WXDLLEXPORT wxWindowBase;
 // appear. It can be either a solid block or a custom bitmap (TODO)
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxCaretBase
+class WXDLLIMPEXP_CORE wxCaretBase
 {
 public:
     // ctors
@@ -147,7 +147,7 @@ public:
     virtual void OnKillFocus() { }
 
 protected:
-    // these functions may be overriden in the derived classes, but they
+    // these functions may be overridden in the derived classes, but they
     // should call the base class version first
     virtual bool DoCreate(wxWindowBase *window, int width, int height)
     {
@@ -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);
 };
 
 // ---------------------------------------------------------------------------
@@ -199,30 +199,26 @@ private:
     #include "wx/generic/caret.h"
 #endif // platform
 
-#ifndef wxHAS_CARET_USING_OVERLAYS
-    #define wxHAS_CARET_USING_OVERLAYS 0
-#endif
-
 // ----------------------------------------------------------------------------
 // wxCaretSuspend: a simple class which hides the caret in its ctor and
 // restores it in the dtor, this should be used when drawing on the screen to
 // avoid overdrawing the caret
 // ----------------------------------------------------------------------------
 
-#if wxHAS_CARET_USING_OVERLAYS
+#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)
@@ -246,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
@@ -254,4 +250,3 @@ private:
 #endif // wxUSE_CARET
 
 #endif // _WX_CARET_H_BASE_
-