Use the data scheme to load resources in the WebKitGTK+ implementation, rather than...

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

diff --git a/src/stc/ScintillaWX.h b/src/stc/ScintillaWX.h
index 26e9c239e58361882c97cd51d3ea3d6e3e7ce469..df5ad6748a0857c31258dda85bfd2144e132788a 100644 (file)
--- a/src/stc/ScintillaWX.h
+++ b/src/stc/ScintillaWX.h
@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////

-// Name:        ScintillaWX.h
+// Name:        src/stc/ScintillaWX.h

 // 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
 // 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


@@ -11,7 +11,7 @@
 // Created:     13-Jan-2000
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 by Total Control Software
 // Created:     13-Jan-2000
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 by Total Control Software

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __ScintillaWX_h__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __ScintillaWX_h__


@@ -26,10 +26,11 @@
 #include <string.h>
 
 #include "Platform.h"
 #include <string.h>
 
 #include "Platform.h"

-
+#include "SplitVector.h"
+#include "Partitioning.h"
+#include "RunStyles.h"

 #include "Scintilla.h"
 #include "Scintilla.h"

-#include "CharClassify.h"
-#include "XPM.h"
+#include "ScintillaWidget.h"

 #ifdef SCI_LEXER
 #include "SciLexer.h"
 #include "PropSet.h"
 #ifdef SCI_LEXER
 #include "SciLexer.h"
 #include "PropSet.h"


@@ -42,12 +43,18 @@
 #include "CallTip.h"
 #include "KeyMap.h"
 #include "Indicator.h"
 #include "CallTip.h"
 #include "KeyMap.h"
 #include "Indicator.h"

+#include "XPM.h"

 #include "LineMarker.h"
 #include "Style.h"
 #include "LineMarker.h"
 #include "Style.h"

-#include "ViewStyle.h"

 #include "AutoComplete.h"
 #include "AutoComplete.h"

+#include "ViewStyle.h"
+#include "CharClassify.h"
+#include "Decoration.h"

 #include "Document.h"
 #include "Document.h"

+#include "Selection.h"
+#include "PositionCache.h"

 #include "Editor.h"
 #include "Editor.h"

+#include "PropSetSimple.h"

 #include "ScintillaBase.h"
 
 #ifdef __WXMSW__
 #include "ScintillaBase.h"
 
 #ifdef __WXMSW__


@@ -144,7 +151,6 @@ public:
     int  DoKeyDown(const wxKeyEvent& event, bool* consumed);
     void DoTick() { Tick(); }
     void DoOnIdle(wxIdleEvent& evt);
     int  DoKeyDown(const wxKeyEvent& event, bool* consumed);
     void DoTick() { Tick(); }
     void DoOnIdle(wxIdleEvent& evt);

-    void DoStartDrag();

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


@@ -176,7 +182,6 @@ private:
 #if wxUSE_DRAG_AND_DROP
     wxSTCDropTarget*    dropTarget;
     wxDragResult        dragResult;
 #if wxUSE_DRAG_AND_DROP
     wxSTCDropTarget*    dropTarget;
     wxDragResult        dragResult;

-    wxTimer*            startDragTimer;

 #endif
 
     int                 wheelRotation;
 #endif
 
     int                 wheelRotation;