fix wxStringOutputStream::Write() in Unicode build when the output overlaps a boundar...

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

diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
index dde5aa02b6bd1f5ea1310a5bff64290d12929636..bd36f73a317ebe469b19a1767dfacce4df690456 100644 (file)
--- a/include/wx/stc/stc.h
+++ b/include/wx/stc/stc.h
@@ -20,19 +20,15 @@
 #ifndef __stc_h__
 #define __stc_h__
 
+#include "wx/defs.h"
 
-#include "wx/wx.h"
-#include "wx/dnd.h"
-
+#if wxUSE_STC
 
-#ifdef WXMAKINGDLL_STC
-    #define WXDLLIMPEXP_STC WXEXPORT
-#elif defined(WXUSINGDLL)
-    #define WXDLLIMPEXP_STC WXIMPORT
-#else // not making nor using DLL
-    #define WXDLLIMPEXP_STC
-#endif
+#include "wx/control.h"
+#include "wx/dnd.h"
+#include "wx/stopwatch.h"
 
+class WXDLLIMPEXP_CORE wxScrollBar;
 
 // SWIG can't handle "#if" type of conditionals, only "#ifdef"
 #ifdef SWIG
@@ -2157,10 +2153,10 @@ public:
     void SetCaretLineVisible(bool show);
 
     // Get the colour of the background of the line containing the caret.
-    wxColour GetCaretLineBack();
+    wxColour GetCaretLineBackground();
 
     // Set the colour of the background of the line containing the caret.
-    void SetCaretLineBack(const wxColour& back);
+    void SetCaretLineBackground(const wxColour& back);
 
     // Set a style to be changeable or not (read only).
     // Experimental feature, currently buggy.
@@ -3618,4 +3614,4 @@ inline const wxWX2MBbuf wx2stc(const wxString& str) {
 //----------------------------------------------------------------------
 #endif
 
-
+#endif // wxUSE_STC