fix several problems in handling of the menu items with negative ids

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

diff --git a/include/wx/msw/textentry.h b/include/wx/msw/textentry.h
index a39139df666e6462ef46d97da19d8d46eb62a1f4..ed202cac11ded488383d5123558710ca8bc9d80c 100644 (file)
--- a/include/wx/msw/textentry.h
+++ b/include/wx/msw/textentry.h
@@ -42,6 +42,13 @@ public:
         { DoSetSelection(from, to); }\r
     virtual void GetSelection(long *from, long *to) const;\r
 \r
         { DoSetSelection(from, to); }\r
     virtual void GetSelection(long *from, long *to) const;\r
 \r

+    // auto-completion uses COM under Windows so they won't work without\r
+    // wxUSE_OLE as OleInitialize() is not called then\r
+#if wxUSE_OLE\r
+    virtual bool AutoComplete(const wxArrayString& choices);\r
+    virtual bool AutoCompleteFileNames();\r
+#endif // wxUSE_OLE\r
+\r

     virtual bool IsEditable() const;\r
     virtual void SetEditable(bool editable);\r
 \r
     virtual bool IsEditable() const;\r
     virtual void SetEditable(bool editable);\r
 \r