X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a29a241fd60b5df7506e2dd4d8b89eb483da90e8..e9159fe8e8f1b3653c506805cbb79280aa2a0f38:/contrib/src/stc/stc.h.in

diff --git a/contrib/src/stc/stc.h.in b/contrib/src/stc/stc.h.in
index 13ca81ae90..518b0361d9 100644
--- a/contrib/src/stc/stc.h.in
+++ b/contrib/src/stc/stc.h.in
@@ -35,7 +35,14 @@
 //----------------------------------------------------------------------
 // Others
 
-#define wxSTC_MASK_FOLDERS ((1 << wxSTC_MARKNUM_FOLDER) | (1 << wxSTC_MARKNUM_FOLDEROPEN))
+#define wxSTC_MASK_FOLDERS     ((1 << wxSTC_MARKNUM_FOLDER) | \
+                                (1 << wxSTC_MARKNUM_FOLDEROPEN) | \
+                                (1 << wxSTC_MARKNUM_FOLDERSUB) | \
+                                (1 << wxSTC_MARKNUM_FOLDERTAIL) | \
+                                (1 << wxSTC_MARKNUM_FOLDERMIDTAIL) | \
+                                (1 << wxSTC_MARKNUM_FOLDEROPENMID) | \
+                                (1 << wxSTC_MARKNUM_FOLDEREND))
+
 
 
 
@@ -148,6 +155,14 @@ public:
     // Send a message to Scintilla
     long SendMsg(int msg, long wp=0, long lp=0);
 
+
+    // Set the vertical scrollbar to use instead of the ont that's built-in.
+    void SetVScrollBar(wxScrollBar* bar) { m_vScrollBar = bar; }
+
+
+    // Set the horizontal scrollbar to use instead of the ont that's built-in.
+    void SetHScrollBar(wxScrollBar* bar) { m_hScrollBar = bar; }
+
 //----------------------------------------------------------------------
 
 
@@ -156,10 +171,12 @@ private:
     // Event handlers
     void OnPaint(wxPaintEvent& evt);
     void OnScrollWin(wxScrollWinEvent& evt);
+    void OnScroll(wxScrollEvent& evt);
     void OnSize(wxSizeEvent& evt);
     void OnMouseLeftDown(wxMouseEvent& evt);
     void OnMouseMove(wxMouseEvent& evt);
     void OnMouseLeftUp(wxMouseEvent& evt);
+    void OnMouseRightUp(wxMouseEvent& evt);
     void OnContextMenu(wxContextMenuEvent& evt);
     void OnMouseWheel(wxMouseEvent& evt);
     void OnChar(wxKeyEvent& evt);
@@ -183,6 +200,8 @@ private:
 
     ScintillaWX*        m_swx;
     wxStopWatch         m_stopWatch;
+    wxScrollBar*        m_vScrollBar;
+    wxScrollBar*        m_hScrollBar;
 
     bool                m_lastKeyDownConsumed;
 
@@ -196,6 +215,9 @@ private:
 class wxStyledTextEvent : public wxCommandEvent {
 public:
     wxStyledTextEvent(wxEventType commandType=0, int id=0);
+#ifndef SWIG
+    wxStyledTextEvent(const wxStyledTextEvent& event);
+#endif
     ~wxStyledTextEvent() {}
 
     void SetPosition(int pos)             { m_position = pos; }
@@ -244,7 +266,7 @@ public:
     bool GetControl() const;
     bool GetAlt() const;
 
-    void CopyObject(wxObject& obj) const;
+    virtual wxEvent* Clone() const { return new wxStyledTextEvent(*this); }
 
 #ifndef SWIG
 private:
@@ -358,7 +380,6 @@ typedef void (wxEvtHandler::*wxStyledTextEventFunction)(wxStyledTextEvent&);
 #define EVT_STC_START_DRAG(id, fn)              DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_START_DRAG,            id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
 #define EVT_STC_DRAG_OVER(id, fn)               DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DRAG_OVER,             id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
 #define EVT_STC_DO_DROP(id, fn)                 DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DO_DROP,               id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
-
 #endif
 
 //----------------------------------------------------------------------