Return old, not new, selection from wxMSW wxNotebook::ChangeSelection().

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

diff --git a/include/wx/msw/textentry.h b/include/wx/msw/textentry.h
index 25ee6c62cd0f7b9643ed8a91de1e9316241be0ac..ade77243f2ce06ed6f2f70c460fc150007f81654 100644 (file)
--- a/include/wx/msw/textentry.h
+++ b/include/wx/msw/textentry.h
@@ -3,7 +3,7 @@
 // Purpose:     wxMSW-specific wxTextEntry implementation
 // Author:      Vadim Zeitlin
 // Created:     2007-09-26
-// RCS-ID:      $Id: textentry.h 48944 2007-09-26 00:30:22Z VZ $
+// RCS-ID:      $Id$
 // Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -18,11 +18,15 @@
 class WXDLLIMPEXP_CORE wxTextEntry : public wxTextEntryBase
 {
 public:
-    wxTextEntry() { }
+    wxTextEntry()
+    {
+#if wxUSE_OLE
+        m_enumStrings = NULL;
+#endif // wxUSE_OLE
+    }
 
     // implement wxTextEntryBase pure virtual methods
     virtual void WriteText(const wxString& text);
-    virtual wxString GetValue() const;
     virtual void Remove(long from, long to);
 
     virtual void Copy();
@@ -60,6 +64,8 @@ public:
 #endif // wxUSE_UXTHEME
 
 protected:
+    virtual wxString DoGetValue() const;
+
     // this is really a hook for multiline text controls as the single line
     // ones don't need to ever scroll to show the selection but having it here
     // allows us to put Remove() in the base class
@@ -70,9 +76,18 @@ protected:
     };
     virtual void DoSetSelection(long from, long to, int flags = SetSel_Scroll);
 
+    // margins functions
+    virtual bool DoSetMargins(const wxPoint& pt);
+    virtual wxPoint DoGetMargins() const;
+
 private:
     // implement this to return the HWND of the EDIT control
     virtual WXHWND GetEditHWND() const = 0;
+
+#if wxUSE_OLE
+    // enumerator for strings currently used for auto-completion or NULL
+    class wxIEnumString *m_enumStrings;
+#endif // wxUSE_OLE
 };
 
 #endif // _WX_MSW_TEXTENTRY_H_