X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2c62dd25cd15dbe70aafc8049267dd0bf922eec3..32485259c1342115488d219776dfebeb3d4d81b1:/include/wx/msw/textctrl.h

diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h
index 1fb28361f6..5d7815f099 100644
--- a/include/wx/msw/textctrl.h
+++ b/include/wx/msw/textctrl.h
@@ -131,7 +131,7 @@ public:
     virtual void SetInsertionPoint(long pos);
     virtual void SetInsertionPointEnd();
     virtual long GetInsertionPoint() const;
-    virtual long GetLastPosition() const;
+    virtual wxTextPos GetLastPosition() const;
 
     virtual void SetSelection(long from, long to);
     virtual void SetEditable(bool editable);
@@ -148,7 +148,7 @@ public:
 
     virtual void Command(wxCommandEvent& event);
     virtual bool MSWCommand(WXUINT param, WXWORD id);
-    virtual WXHBRUSH MSWControlColor(WXHDC hDC);
+    virtual WXHBRUSH MSWControlColor(WXHDC hDC, WXHWND hWnd);
 
 #if wxUSE_RICHEDIT
     virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
@@ -188,7 +188,7 @@ public:
 
     // Show a context menu for Rich Edit controls (the standard
     // EDIT control has one already)
-    void OnRightClick(wxMouseEvent& event);
+    void OnContextMenu(wxContextMenuEvent& event);
 
     // be sure the caret remains invisible if the user
     // called HideNativeCaret() before
@@ -260,12 +260,6 @@ private:
     wxMenu* m_privateContextMenu;
 
     bool m_isNativeCaretShown;
-
-    // this is an optimization: instead of checking all the time whether we
-    // need to move the caret to the end of text (before appending to the
-    // control), we remember whether it is already at the end of text in this
-    // variable
-    bool m_isCaretAtEnd;
 };
 
 #endif