Commented out call that breaks metal style setting before Create

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

diff --git a/src/stc/ScintillaWX.h b/src/stc/ScintillaWX.h
index d5a0127b7c87f39708fa9b1b32d92773dd82d8a6..c945804fce32bc5ffd2ba5d9c74c4ceeb6830325 100644 (file)
--- a/src/stc/ScintillaWX.h
+++ b/src/stc/ScintillaWX.h
@@ -48,10 +48,6 @@
 #include "Editor.h"
 #include "ScintillaBase.h"
 
 #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 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 +139,11 @@ 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);

-    
+    void DoStartDrag();
+

 #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);


@@ -175,10 +174,21 @@ private:
 #if wxUSE_DRAG_AND_DROP
     wxSTCDropTarget*    dropTarget;
     wxDragResult        dragResult;
 #if wxUSE_DRAG_AND_DROP
     wxSTCDropTarget*    dropTarget;
     wxDragResult        dragResult;

+    wxTimer*            startDragTimer;

 #endif
 #endif

-    int                 wheelRotation;

 
 

+    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;
 };