fixed bug with the caret positioning after SetValue() introduced by the last commit

[wxWidgets.git] / include / wx / stc / stc.h

diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
index 9eadfcd66ade1c04c523d6283ee9ffdecad7b59d..5cd478ed54f54246c58f8b28c15e44d7b4381f4a 100644 (file)
--- a/include/wx/stc/stc.h
+++ b/include/wx/stc/stc.h
@@ -1594,6 +1594,14 @@ public:
     // Send a message to Scintilla
     long SendMsg(int msg, long wp=0, long lp=0);
 
     // 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; }
+

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


@@ -1602,10 +1610,12 @@ private:
     // Event handlers
     void OnPaint(wxPaintEvent& evt);
     void OnScrollWin(wxScrollWinEvent& evt);
     // 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 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);
     void OnContextMenu(wxContextMenuEvent& evt);
     void OnMouseWheel(wxMouseEvent& evt);
     void OnChar(wxKeyEvent& evt);


@@ -1629,6 +1639,8 @@ private:
 
     ScintillaWX*        m_swx;
     wxStopWatch         m_stopWatch;
 
     ScintillaWX*        m_swx;
     wxStopWatch         m_stopWatch;

+    wxScrollBar*        m_vScrollBar;
+    wxScrollBar*        m_hScrollBar;

 
     bool                m_lastKeyDownConsumed;
 
 
     bool                m_lastKeyDownConsumed;
 


@@ -1641,8 +1653,10 @@ private:
 
 class wxStyledTextEvent : public wxCommandEvent {
 public:
 
 class wxStyledTextEvent : public wxCommandEvent {
 public:

-    wxStyledTextEvent(const wxStyledTextEvent& event);

     wxStyledTextEvent(wxEventType commandType=0, int id=0);
     wxStyledTextEvent(wxEventType commandType=0, int id=0);

+#ifndef SWIG
+    wxStyledTextEvent(const wxStyledTextEvent& event);
+#endif

     ~wxStyledTextEvent() {}
 
     void SetPosition(int pos)             { m_position = pos; }
     ~wxStyledTextEvent() {}
 
     void SetPosition(int pos)             { m_position = pos; }


@@ -1695,7 +1709,6 @@ public:
     bool GetControl() const;
     bool GetAlt() const;
 
     bool GetControl() const;
     bool GetAlt() const;
 

-//    void CopyObject(wxObject& obj) const;

     virtual wxEvent* Clone() const { return new wxStyledTextEvent(*this); }
 
 #ifndef SWIG
     virtual wxEvent* Clone() const { return new wxStyledTextEvent(*this); }
 
 #ifndef SWIG