remove unused wxAppTraits-related files

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

diff --git a/include/wx/caret.h b/include/wx/caret.h
index 3b94c9260449a7c64856aa5aee602a857e73d12c..e65e9deca1299501dbe4a297a216b9dcae0cefcd 100644 (file)
--- 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:
 // Purpose:     wxCaretBase class - the interface of wxCaret
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -20,8 +20,8 @@
 // forward declarations
 // ---------------------------------------------------------------------------
 
 // forward declarations
 // ---------------------------------------------------------------------------
 

-class WXDLLEXPORT wxWindow;
-class WXDLLEXPORT wxWindowBase;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxWindowBase;

 
 // ----------------------------------------------------------------------------
 // headers we have to include
 
 // ----------------------------------------------------------------------------
 // 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)
 // ----------------------------------------------------------------------------
 
 // appear. It can be either a solid block or a custom bitmap (TODO)
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxCaretBase
+class WXDLLIMPEXP_CORE wxCaretBase

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


@@ -199,20 +199,16 @@ private:
     #include "wx/generic/caret.h"
 #endif // platform
 
     #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
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // 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
 
 // 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)) {}


@@ -222,7 +218,7 @@ public:
 
 #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)


@@ -254,4 +250,3 @@ private:
 #endif // wxUSE_CARET
 
 #endif // _WX_CARET_H_BASE_
 #endif // wxUSE_CARET
 
 #endif // _WX_CARET_H_BASE_

-