removed wxUSE_PENWINDOWS (and its misspellings), it didn't work and wasn't used/defined

[wxWidgets.git] / include / wx / msw / textctrl.h

diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h
index 1fb28361f6c28d1466dae07a4a1999b6e329e3fe..4b2b906625b4ee6867c2cdb3718e1436841ac987 100644 (file)
--- 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
@@ -201,6 +201,10 @@ protected:
     // intercept WM_GETDLGCODE
     virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
 
+    // return true if this control has a user-set limit on amount of text (i.e.
+    // the limit is due to a previous call to SetMaxLength() and not built in)
+    bool HasSpaceLimit(unsigned int *len) const;
+
     // call this to increase the size limit (will do nothing if the current
     // limit is big enough)
     //
@@ -260,12 +264,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