added format parameter to File/DirName()

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

diff --git a/contrib/src/stc/ScintillaWX.h b/contrib/src/stc/ScintillaWX.h
index fdd4f98dbdf3e8d6e882fcc208c75d22ed06436c..4c6b35c6e3276e05ca65aa4743b1284a840829bb 100644 (file)
--- a/contrib/src/stc/ScintillaWX.h
+++ b/contrib/src/stc/ScintillaWX.h
@@ -19,9 +19,15 @@
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

+#include <ctype.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+

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

+#include "XPM.h"

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


@@ -56,6 +62,7 @@ class ScintillaWX;
 //----------------------------------------------------------------------
 // Helper classes
 
 //----------------------------------------------------------------------
 // Helper classes
 

+#if wxUSE_DRAG_AND_DROP

 class wxSTCDropTarget : public wxTextDropTarget {
 public:
     void SetScintilla(ScintillaWX* swx) {
 class wxSTCDropTarget : public wxTextDropTarget {
 public:
     void SetScintilla(ScintillaWX* swx) {


@@ -70,7 +77,7 @@ public:
 private:
     ScintillaWX* swx;
 };
 private:
     ScintillaWX* swx;
 };

-
+#endif

 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 


@@ -116,18 +123,21 @@ public:
     void DoLoseFocus();
     void DoGainFocus();
     void DoSysColourChange();
     void DoLoseFocus();
     void DoGainFocus();
     void DoSysColourChange();

-    void DoButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt);
-    void DoButtonUp(Point pt, unsigned int curTime, bool ctrl);
-    void DoButtonMove(Point pt);
-    void DoMouseWheel(int rotation, int delta, int linesPerAction);
-    void DoAddChar(char ch);
-    int  DoKeyDown(int key, bool shift, bool ctrl, bool alt);
+    void DoLeftButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt);
+    void DoLeftButtonUp(Point pt, unsigned int curTime, bool ctrl);
+    void DoLeftButtonMove(Point pt);
+    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* consumed);

     void DoTick() { Tick(); }
 
     void DoTick() { Tick(); }
 

+#if wxUSE_DRAG_AND_DROP

     bool DoDropText(long x, long y, const wxString& data);
     wxDragResult DoDragEnter(wxCoord x, wxCoord y, wxDragResult def);
     wxDragResult DoDragOver(wxCoord x, wxCoord y, wxDragResult def);
     void DoDragLeave();
     bool DoDropText(long x, long y, const wxString& data);
     wxDragResult DoDragEnter(wxCoord x, wxCoord y, wxDragResult def);
     wxDragResult DoDragOver(wxCoord x, wxCoord y, wxDragResult def);
     void DoDragLeave();

+#endif

 
     void DoCommand(int ID);
     void DoContextMenu(Point pt);
 
     void DoCommand(int ID);
     void DoContextMenu(Point pt);


@@ -140,14 +150,20 @@ public:
     bool GetHideSelection() { return hideSelection; }
     void DoScrollToLine(int line);
     void DoScrollToColumn(int column);
     bool GetHideSelection() { return hideSelection; }
     void DoScrollToLine(int line);
     void DoScrollToColumn(int column);

+    void ClipChildren(wxDC& dc, PRectangle rect);

 
 private:
     bool                capturedMouse;
     wxStyledTextCtrl*   stc;
 
 
 private:
     bool                capturedMouse;
     wxStyledTextCtrl*   stc;
 

+#if wxUSE_DRAG_AND_DROP

     wxSTCDropTarget*    dropTarget;
     wxDragResult        dragResult;
     wxSTCDropTarget*    dropTarget;
     wxDragResult        dragResult;

+#endif

     int                 wheelRotation;
     int                 wheelRotation;

+
+
+    friend class wxSTCCallTip;

 };
 
 //----------------------------------------------------------------------
 };
 
 //----------------------------------------------------------------------