Force wide char environment version initialization in wxGetEnvMap().

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

diff --git a/include/wx/textentry.h b/include/wx/textentry.h
index 7601444ca84d89360c0b2cbfcd2af2850ab5e52d..2ede40d714a4b3189dc0f6a038572e514147a662 100644 (file)
--- a/include/wx/textentry.h
+++ b/include/wx/textentry.h
@@ -20,6 +20,7 @@ class WXDLLIMPEXP_FWD_CORE wxTextCompleter;
 class WXDLLIMPEXP_FWD_CORE wxTextEntryHintData;
 class WXDLLIMPEXP_FWD_CORE wxWindow;
 
 class WXDLLIMPEXP_FWD_CORE wxTextEntryHintData;
 class WXDLLIMPEXP_FWD_CORE wxWindow;
 

+#include "wx/filefn.h"              // for wxFILE and wxDIR only

 #include "wx/gdicmn.h"              // for wxPoint
 
 // ----------------------------------------------------------------------------
 #include "wx/gdicmn.h"              // for wxPoint
 
 // ----------------------------------------------------------------------------


@@ -117,7 +118,10 @@ public:
         { return DoAutoCompleteStrings(choices); }
 
     bool AutoCompleteFileNames()
         { return DoAutoCompleteStrings(choices); }
 
     bool AutoCompleteFileNames()

-        { return DoAutoCompleteFileNames(); }
+        { return DoAutoCompleteFileNames(wxFILE); }
+
+    bool AutoCompleteDirectories()
+        { return DoAutoCompleteFileNames(wxDIR); }

 
     // notice that we take ownership of the pointer and will delete it
     //
 
     // notice that we take ownership of the pointer and will delete it
     //


@@ -230,7 +234,8 @@ protected:
     // the other one(s)
     virtual bool DoAutoCompleteStrings(const wxArrayString& WXUNUSED(choices))
         { return false; }
     // the other one(s)
     virtual bool DoAutoCompleteStrings(const wxArrayString& WXUNUSED(choices))
         { return false; }

-    virtual bool DoAutoCompleteFileNames() { return false; }
+    virtual bool DoAutoCompleteFileNames(int WXUNUSED(flags)) // wxFILE | wxDIR
+        { return false; }

     virtual bool DoAutoCompleteCustom(wxTextCompleter *completer);
 
 
     virtual bool DoAutoCompleteCustom(wxTextCompleter *completer);