first pass of wxUniv merge - nothing works, most parts don't even compile

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/caret.h

@@ -12,6 +12,10 @@
 #ifndef _WX_CARET_H_BASE_
 #define _WX_CARET_H_BASE_
 
+#include "wx/defs.h"
+
+#if wxUSE_CARET
+
 #ifdef __GNUG__
 #pragma interface "caret.h"
 #endif
@@ -222,5 +226,7 @@ private:
     wxCaret *m_caret;
 };
 
+#endif // wxUSE_CARET
+
 #endif // _WX_CARET_H_BASE_