removed enum that was causing more problems than it was worth

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

diff --git a/contrib/src/stc/ScintillaWX.h b/contrib/src/stc/ScintillaWX.h
index d904fc3c1875d0c917e2870bf988111fb1cb6f23..d5a0127b7c87f39708fa9b1b32d92773dd82d8a6 100644 (file)
--- a/contrib/src/stc/ScintillaWX.h
+++ b/contrib/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


@@ -27,6 +27,7 @@
 #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"


@@ -54,7 +55,15 @@
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

-class wxStyledTextCtrl;           // forward
+#ifdef WXMAKINGDLL_STC
+    #define WXDLLIMPEXP_STC WXEXPORT
+#elif defined(WXUSINGDLL)
+    #define WXDLLIMPEXP_STC WXIMPORT
+#else // not making nor using DLL
+    #define WXDLLIMPEXP_STC
+#endif
+
+class WXDLLIMPEXP_STC wxStyledTextCtrl;           // forward

 class ScintillaWX;
 
 
 class ScintillaWX;
 
 


@@ -90,6 +99,7 @@ public:
     virtual void Initialise();
     virtual void Finalise();
     virtual void StartDrag();
     virtual void Initialise();
     virtual void Finalise();
     virtual void StartDrag();

+    virtual bool SetIdle(bool on);

     virtual void SetTicking(bool on);
     virtual void SetMouseCapture(bool on);
     virtual bool HaveMouseCapture();
     virtual void SetTicking(bool on);
     virtual void SetMouseCapture(bool on);
     virtual bool HaveMouseCapture();


@@ -99,6 +109,8 @@ public:
     virtual bool ModifyScrollBars(int nMax, int nPage);
     virtual void Copy();
     virtual void Paste();
     virtual bool ModifyScrollBars(int nMax, int nPage);
     virtual void Copy();
     virtual void Paste();

+    virtual void CopyToClipboard(const SelectionText &selectedText);
+

     virtual void CreateCallTipWindow(PRectangle rc);
     virtual void AddToPopUp(const char *label, int cmd = 0, bool enabled = true);
     virtual void ClaimSelection();
     virtual void CreateCallTipWindow(PRectangle rc);
     virtual void AddToPopUp(const char *label, int cmd = 0, bool enabled = true);
     virtual void ClaimSelection();


@@ -113,6 +125,7 @@ public:
     virtual void NotifyChange();
     virtual void NotifyParent(SCNotification scn);
 
     virtual void NotifyChange();
     virtual void NotifyParent(SCNotification scn);
 

+    virtual void CancelModes();

 
     // Event delegates
     void DoPaint(wxDC* dc, wxRect rect);
 
     // Event delegates
     void DoPaint(wxDC* dc, wxRect rect);


@@ -128,9 +141,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* consumed);
+    int  DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool meta, bool* consumed);

     void DoTick() { Tick(); }
     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);


@@ -149,9 +163,13 @@ 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);
+    void SetUseAntiAliasing(bool useAA);
+    bool GetUseAntiAliasing();

 
 private:
     bool                capturedMouse;
 
 private:
     bool                capturedMouse;

+    bool                focusEvent;

     wxStyledTextCtrl*   stc;
 
 #if wxUSE_DRAG_AND_DROP
     wxStyledTextCtrl*   stc;
 
 #if wxUSE_DRAG_AND_DROP


@@ -159,6 +177,9 @@ private:
     wxDragResult        dragResult;
 #endif
     int                 wheelRotation;
     wxDragResult        dragResult;
 #endif
     int                 wheelRotation;

+
+
+    friend class wxSTCCallTip;

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