applied part of patch 1169925: fix errors with multibyte <-> wx conversions

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

diff --git a/src/stc/ScintillaWX.h b/src/stc/ScintillaWX.h
index bb09a482bf18dae42150b4940d4f9aadeea1266b..0746fd24b9baeacc65680dcbb32a2e201c721a6b 100644 (file)
--- a/src/stc/ScintillaWX.h
+++ b/src/stc/ScintillaWX.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////
 // Name:        ScintillaWX.h
 ////////////////////////////////////////////////////////////////////////////
 // Name:        ScintillaWX.h

-// Purpose:     A wxWindows implementation of Scintilla.  A class derived
+// Purpose:     A wxWidgets implementation of Scintilla.  A class derived

 //              from ScintillaBase that uses the "wx platform" defined in
 //              PlatWX.cpp.  This class is one end of a bridge between
 //              the wx world and the Scintilla world.  It needs a peer
 //              from ScintillaBase that uses the "wx platform" defined in
 //              PlatWX.cpp.  This class is one end of a bridge between
 //              the wx world and the Scintilla world.  It needs a peer


@@ -127,6 +127,8 @@ public:
 
     virtual void CancelModes();
 
 
     virtual void CancelModes();
 

+    virtual void UpdateSystemCaret();
+

     // Event delegates
     void DoPaint(wxDC* dc, wxRect rect);
     void DoHScroll(int type, int pos);
     // Event delegates
     void DoPaint(wxDC* dc, wxRect rect);
     void DoHScroll(int type, int pos);


@@ -141,10 +143,10 @@ public:
     void DoMiddleButtonUp(Point pt);
     void DoMouseWheel(int rotation, int delta, int linesPerAction, int ctrlDown, bool isPageScroll);
     void DoAddChar(int key);
     void DoMiddleButtonUp(Point pt);
     void DoMouseWheel(int rotation, int delta, int linesPerAction, int ctrlDown, bool isPageScroll);
     void DoAddChar(int key);

-    int  DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool meta, bool* consumed);
+    int  DoKeyDown(const wxKeyEvent& event, bool* consumed);

     void DoTick() { Tick(); }
     void DoOnIdle(wxIdleEvent& evt);
     void DoTick() { Tick(); }
     void DoOnIdle(wxIdleEvent& evt);

-    
+

 #if wxUSE_DRAG_AND_DROP
     bool DoDropText(long x, long y, const wxString& data);
     wxDragResult DoDragEnter(wxCoord x, wxCoord y, wxDragResult def);
 #if wxUSE_DRAG_AND_DROP
     bool DoDropText(long x, long y, const wxString& data);
     wxDragResult DoDragEnter(wxCoord x, wxCoord y, wxDragResult def);


@@ -178,7 +180,16 @@ private:
 #endif
     int                 wheelRotation;
 
 #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;
 };
 
     friend class wxSTCCallTip;
 };