implement wxListCtrl::GetSubItemRect() for generic version and fix bug in it in wxMSW...

[wxWidgets.git] / src / stc / stc.cpp.in

diff --git a/src/stc/stc.cpp.in b/src/stc/stc.cpp.in
index 637f4c09bdbcd0e8fb7866e140a641ae4c30c50d..3ce719586b23b2653e94486e8c86630ceb17389a 100644 (file)
--- a/src/stc/stc.cpp.in
+++ b/src/stc/stc.cpp.in
@@ -197,6 +197,7 @@ bool wxStyledTextCtrl::Create(wxWindow *parent,
     m_swx = new ScintillaWX(this);
     m_stopWatch.Start();
     m_lastKeyDownConsumed = false;
     m_swx = new ScintillaWX(this);
     m_stopWatch.Start();
     m_lastKeyDownConsumed = false;

+    m_lastWheelTimestamp = 0;

     m_vScrollBar = NULL;
     m_hScrollBar = NULL;
 #if wxUSE_UNICODE
     m_vScrollBar = NULL;
     m_hScrollBar = NULL;
 #if wxUSE_UNICODE


@@ -223,7 +224,7 @@ wxStyledTextCtrl::~wxStyledTextCtrl() {
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

-long wxStyledTextCtrl::SendMsg(int msg, long wp, long lp) const
+wxIntPtr wxStyledTextCtrl::SendMsg(int msg, wxUIntPtr wp, wxIntPtr lp) const

 {
     return m_swx->WndProc(msg, wp, lp);
 }
 {
     return m_swx->WndProc(msg, wp, lp);
 }


@@ -611,12 +612,12 @@ bool wxStyledTextCtrl::GetUseAntiAliasing() {
 
 void wxStyledTextCtrl::AddTextRaw(const char* text)
 {
 
 void wxStyledTextCtrl::AddTextRaw(const char* text)
 {

-    SendMsg(SCI_ADDTEXT, strlen(text), (long)text);
+    SendMsg(SCI_ADDTEXT, strlen(text), (sptr_t)text);

 }
 
 void wxStyledTextCtrl::InsertTextRaw(int pos, const char* text)
 {
 }
 
 void wxStyledTextCtrl::InsertTextRaw(int pos, const char* text)
 {

-    SendMsg(SCI_INSERTTEXT, pos, (long)text);
+    SendMsg(SCI_INSERTTEXT, pos, (sptr_t)text);

 }
 
 wxCharBuffer wxStyledTextCtrl::GetCurLineRaw(int* linePos)
 }
 
 wxCharBuffer wxStyledTextCtrl::GetCurLineRaw(int* linePos)


@@ -629,7 +630,7 @@ wxCharBuffer wxStyledTextCtrl::GetCurLineRaw(int* linePos)
     }
 
     wxCharBuffer buf(len);
     }
 
     wxCharBuffer buf(len);

-    int pos = SendMsg(SCI_GETCURLINE, len, (long)buf.data());
+    int pos = SendMsg(SCI_GETCURLINE, len, (sptr_t)buf.data());

     if (linePos)  *linePos = pos;
     return buf;
 }
     if (linePos)  *linePos = pos;
     return buf;
 }


@@ -643,7 +644,7 @@ wxCharBuffer wxStyledTextCtrl::GetLineRaw(int line)
     }
 
     wxCharBuffer buf(len);
     }
 
     wxCharBuffer buf(len);

-    SendMsg(SCI_GETLINE, line, (long)buf.data());
+    SendMsg(SCI_GETLINE, line, (sptr_t)buf.data());

     return buf;
 }
 
     return buf;
 }
 


@@ -660,7 +661,7 @@ wxCharBuffer wxStyledTextCtrl::GetSelectedTextRaw()
     }
 
     wxCharBuffer buf(len);
     }
 
     wxCharBuffer buf(len);

-    SendMsg(SCI_GETSELTEXT, 0, (long)buf.data());
+    SendMsg(SCI_GETSELTEXT, 0, (sptr_t)buf.data());

     return buf;
 }
 
     return buf;
 }
 


@@ -682,26 +683,26 @@ wxCharBuffer wxStyledTextCtrl::GetTextRangeRaw(int startPos, int endPos)
     tr.lpstrText = buf.data();
     tr.chrg.cpMin = startPos;
     tr.chrg.cpMax = endPos;
     tr.lpstrText = buf.data();
     tr.chrg.cpMin = startPos;
     tr.chrg.cpMax = endPos;

-    SendMsg(SCI_GETTEXTRANGE, 0, (long)&tr);
+    SendMsg(SCI_GETTEXTRANGE, 0, (sptr_t)&tr);

     return buf;
 }
 
 void wxStyledTextCtrl::SetTextRaw(const char* text)
 {
     return buf;
 }
 
 void wxStyledTextCtrl::SetTextRaw(const char* text)
 {

-    SendMsg(SCI_SETTEXT, 0, (long)text);
+    SendMsg(SCI_SETTEXT, 0, (sptr_t)text);

 }
 
 wxCharBuffer wxStyledTextCtrl::GetTextRaw()
 {
 }
 
 wxCharBuffer wxStyledTextCtrl::GetTextRaw()
 {

-    int len  = GetTextLength();
-    wxCharBuffer buf(len);
-    SendMsg(SCI_GETTEXT, len, (long)buf.data());
+    int len = GetTextLength();
+    wxCharBuffer buf(len); // adds 1 for NUL automatically
+    SendMsg(SCI_GETTEXT, len + 1, (sptr_t)buf.data());

     return buf;
 }
 
 void wxStyledTextCtrl::AppendTextRaw(const char* text)
 {
     return buf;
 }
 
 void wxStyledTextCtrl::AppendTextRaw(const char* text)
 {

-    SendMsg(SCI_APPENDTEXT, strlen(text), (long)text);
+    SendMsg(SCI_APPENDTEXT, strlen(text), (sptr_t)text);

 }
 
 
 }
 
 


@@ -785,12 +786,21 @@ void wxStyledTextCtrl::OnContextMenu(wxContextMenuEvent& evt) {
 }
 
 
 }
 
 

-void wxStyledTextCtrl::OnMouseWheel(wxMouseEvent& evt) {
-    m_swx->DoMouseWheel(evt.GetWheelRotation(),
-                        evt.GetWheelDelta(),
-                        evt.GetLinesPerAction(),
-                        evt.ControlDown(),
-                        evt.IsPageScroll());
+void wxStyledTextCtrl::OnMouseWheel(wxMouseEvent& evt)
+{
+    // prevent having an event queue with wheel events that cannot be processed
+    // reasonably fast (see ticket #9057)
+    if ( m_lastWheelTimestamp <= evt.GetTimestamp() )
+    {
+        m_lastWheelTimestamp = m_stopWatch.Time();
+        m_swx->DoMouseWheel(evt.GetWheelRotation(),
+                            evt.GetWheelDelta(),
+                            evt.GetLinesPerAction(),
+                            evt.ControlDown(),
+                            evt.IsPageScroll());
+        m_lastWheelTimestamp = m_stopWatch.Time() - m_lastWheelTimestamp;
+        m_lastWheelTimestamp += evt.GetTimestamp();
+    }

 }
 
 
 }