avoid multiple reallocations in wxString::PrintfV() if vsnprintf() returns the total...

[wxWidgets.git] / src / stc / ScintillaWX.h

diff --git a/src/stc/ScintillaWX.h b/src/stc/ScintillaWX.h
index db80889e775d4ec5cf6270494596208b287e3b40..e703efe606873775137cca5f1119bf3cd3c31929 100644 (file)
--- a/src/stc/ScintillaWX.h
+++ b/src/stc/ScintillaWX.h
@@ -48,10 +48,6 @@
 #include "Editor.h"
 #include "ScintillaBase.h"
 
-#include <wx/wx.h>
-#include <wx/dataobj.h>
-#include <wx/clipbrd.h>
-#include <wx/dnd.h>
 
 //----------------------------------------------------------------------
 
@@ -127,6 +123,8 @@ public:
 
     virtual void CancelModes();
 
+    virtual void UpdateSystemCaret();
+
     // Event delegates
     void DoPaint(wxDC* dc, wxRect rect);
     void DoHScroll(int type, int pos);
@@ -178,7 +176,16 @@ private:
 #endif
     int                 wheelRotation;
 
-
+    // For use in creating a system caret
+    bool HasCaretSizeChanged();
+    bool CreateSystemCaret();
+    bool DestroySystemCaret();
+#ifdef __WXMSW__
+    HBITMAP sysCaretBitmap;
+    int sysCaretWidth;
+    int sysCaretHeight;
+#endif
+    
     friend class wxSTCCallTip;
 };