Rebake from clean wx tree.

[wxWidgets.git] / include / wx / caret.h

diff --git a/include/wx/caret.h b/include/wx/caret.h
index c3d3ebd2bdee32bd3d0ac67cfffdaf5e90a15088..c0a30bb893b19593df8fa4b779b291c4a3808435 100644 (file)
--- 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)
 // ----------------------------------------------------------------------------
 
 // appear. It can be either a solid block or a custom bitmap (TODO)
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxCaretBase
+class WXDLLIMPEXP_CORE wxCaretBase

 {
 public:
     // ctors
 {
 public:
     // ctors


@@ -167,7 +167,7 @@ protected:
     // the common initialization
     void Init()
     {
     // 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;
         m_x = m_y = 0;
         m_width = m_height = 0;
         m_countVisible = 0;


@@ -186,7 +186,7 @@ protected:
     int m_countVisible;
 
 private:
     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
 #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)) {}
 
 {
 public:
     wxCaretSuspend(wxWindow *WXUNUSED(win)) {}
 

-    DECLARE_NO_COPY_CLASS(wxCaretSuspend)
+    wxDECLARE_NO_COPY_CLASS(wxCaretSuspend);

 };
 
 #else // !wxHAS_CARET_USING_OVERLAYS
 
 };
 
 #else // !wxHAS_CARET_USING_OVERLAYS
 

-class WXDLLEXPORT wxCaretSuspend
+class WXDLLIMPEXP_CORE wxCaretSuspend

 {
 public:
     wxCaretSuspend(wxWindow *win)
 {
 public:
     wxCaretSuspend(wxWindow *win)


@@ -242,7 +242,7 @@ private:
     wxCaret *m_caret;
     bool     m_show;
 
     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
 };
 
 #endif // wxHAS_CARET_USING_OVERLAYS/!wxHAS_CARET_USING_OVERLAYS