Move code removing "-psn_xxx" command line arguments to common code.

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

diff --git a/interface/wx/textentry.h b/interface/wx/textentry.h
index 31bf9279d7c14ff6edcb1a2cd54c624a976f841c..2152b4ba59c2273edc5d9c7aac27558bed6c64ed 100644 (file)
--- a/interface/wx/textentry.h
+++ b/interface/wx/textentry.h
@@ -3,11 +3,17 @@
 // Purpose:     interface of wxTextEntry
 // Author:      Vadim Zeitlin
 // Created:     2009-03-01 (extracted from wx/textctrl.h)
 // Purpose:     interface of wxTextEntry
 // Author:      Vadim Zeitlin
 // Created:     2009-03-01 (extracted from wx/textctrl.h)

-// RCS-ID:      $Id$

 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwindows.org>
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwindows.org>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+
+/**
+    wxTextPos is a position in the text
+*/
+typedef long wxTextPos;
+
+

 /**
     @class wxTextEntry
 
 /**
     @class wxTextEntry
 


@@ -46,8 +52,8 @@ public:
         Call this function to enable auto-completion of the text typed in a
         single-line text control using the given @a choices.
 
         Call this function to enable auto-completion of the text typed in a
         single-line text control using the given @a choices.
 

-        Notice that currently this function is only implemented in wxGTK2 and
-        wxMSW ports and does nothing under the other platforms.
+        Notice that currently this function is only implemented in wxGTK2,
+        wxMSW and wxOSX/Cocoa ports and does nothing under the other platforms.

 
         @since 2.9.0
 
 
         @since 2.9.0
 


@@ -58,13 +64,47 @@ public:
 
         @see AutoCompleteFileNames()
     */
 
         @see AutoCompleteFileNames()
     */

-    virtual bool AutoComplete(const wxArrayString& choices);
+    bool AutoComplete(const wxArrayString& choices);
+
+    /**
+        Enable auto-completion using the provided completer object.
+
+        This method should be used instead of AutoComplete() overload taking
+        the array of possible completions if the total number of strings is too
+        big as it allows to return the completions dynamically, depending on
+        the text already entered by user and so is more efficient.
+
+        The specified @a completer object will be used to retrieve the list of
+        possible completions for the already entered text and will be deleted
+        by wxTextEntry itself when it's not needed any longer.
+
+        Notice that you need to include @c wx/textcompleter.h in order to
+        define your class inheriting from wxTextCompleter.
+
+        Currently this method is only implemented in wxMSW and wxOSX/Cocoa.
+
+        @since 2.9.2
+
+        @param completer
+            The object to be used for generating completions if non-@NULL. If
+            it is @NULL, auto-completion is disabled. The wxTextEntry object
+            takes ownership of this pointer and will delete it in any case
+            (i.e. even if this method returns @false).
+
+        @return
+            @true if the auto-completion was enabled or @false if the operation
+            failed, typically because auto-completion is not supported by the
+            current platform.
+
+        @see wxTextCompleter
+     */
+    bool AutoComplete(wxTextCompleter *completer);

 
     /**
         Call this function to enable auto-completion of the text typed in a
         single-line text control using all valid file system paths.
 
 
     /**
         Call this function to enable auto-completion of the text typed in a
         single-line text control using all valid file system paths.
 

-        Notice that currently this function is only implemented in wxGTK2 port
+        Notice that currently this function is only implemented in wxMSW port

         and does nothing under the other platforms.
 
         @since 2.9.0
         and does nothing under the other platforms.
 
         @since 2.9.0


@@ -76,7 +116,28 @@ public:
 
         @see AutoComplete()
     */
 
         @see AutoComplete()
     */

-    virtual bool AutoCompleteFileNames();
+    bool AutoCompleteFileNames();
+
+    /**
+        Call this function to enable auto-completion of the text using the file
+        system directories.
+
+        Unlike AutoCompleteFileNames() which completes both file names and
+        directories, this function only completes the directory names.
+
+        Notice that currently this function is only implemented in wxMSW port
+        and does nothing under the other platforms.
+
+        @since 2.9.3
+
+        @return
+            @true if the auto-completion was enabled or @false if the operation
+            failed, typically because auto-completion is not supported by the
+            current platform.
+
+        @see AutoComplete()
+     */
+    bool AutoCompleteDirectories();

 
     /**
         Returns @true if the selection can be copied to the clipboard.
 
     /**
         Returns @true if the selection can be copied to the clipboard.


@@ -118,7 +179,7 @@ public:
         The insertion point is set to the start of the control (i.e. position
         0) by this function.
 
         The insertion point is set to the start of the control (i.e. position
         0) by this function.
 

-        This functions does not generate the @c wxEVT_COMMAND_TEXT_UPDATED
+        This functions does not generate the @c wxEVT_TEXT

         event but otherwise is identical to SetValue().
 
         See @ref overview_events_prog for more information.
         event but otherwise is identical to SetValue().
 
         See @ref overview_events_prog for more information.


@@ -134,7 +195,7 @@ public:
     /**
         Clears the text in the control.
 
     /**
         Clears the text in the control.
 

-        Note that this function will generate a @c wxEVT_COMMAND_TEXT_UPDATED
+        Note that this function will generate a @c wxEVT_TEXT

         event, i.e. its effect is identical to calling @c SetValue("").
     */
     virtual void Clear();
         event, i.e. its effect is identical to calling @c SetValue("").
     */
     virtual void Clear();


@@ -144,24 +205,38 @@ public:
     */
     virtual void Copy();
 
     */
     virtual void Copy();
 

+    /**
+        Copies the selected text to the clipboard and removes it from the control.
+    */
+    virtual void Cut();
+

     /**
         Returns the insertion point, or cursor, position.
 
         This is defined as the zero based index of the character position to
         the right of the insertion point. For example, if the insertion point
     /**
         Returns the insertion point, or cursor, position.
 
         This is defined as the zero based index of the character position to
         the right of the insertion point. For example, if the insertion point

-        is at the end of the single-line text control, it is equal to both
-        GetLastPosition() and @c "GetValue().Length()" (but notice that the latter
-        equality is not necessarily true for multiline edit controls which may
-        use multiple new line characters).
+        is at the end of the single-line text control, it is equal to
+        GetLastPosition().

 
 

-        The following code snippet safely returns the character at the insertion
-        point or the zero character if the point is at the end of the control.
+        Notice that insertion position is, in general, different from the index
+        of the character the cursor position at in the string returned by
+        GetValue(). While this is always the case for the single line controls,
+        multi-line controls can use two characters @c "\\r\\n" as line
+        separator (this is notably the case under MSW) meaning that indices in
+        the control and its string value are offset by 1 for every line.
+
+        Hence to correctly get the character at the current cursor position,
+        taking into account that there can be none if the cursor is at the end
+        of the string, you could do the following:

 
         @code
 
         @code

-        char GetCurrentChar(wxTextCtrl *tc) {
-            if (tc->GetInsertionPoint() == tc->GetLastPosition())
-            return '\0';
-            return tc->GetValue[tc->GetInsertionPoint()];
+        wxString GetCurrentChar(wxTextCtrl *tc)
+        {
+            long pos = tc->GetInsertionPoint();
+            if ( pos == tc->GetLastPosition() )
+                return wxString();
+
+            return tc->GetRange(pos, pos + 1);

         }
         @endcode
     */
         }
         @endcode
     */


@@ -325,7 +400,7 @@ public:
         and the user may enter as much text as the underlying native text control widget
         supports (typically at least 32Kb).
         If the user tries to enter more characters into the text control when it
         and the user may enter as much text as the underlying native text control widget
         supports (typically at least 32Kb).
         If the user tries to enter more characters into the text control when it

-        already is filled up to the maximal length, a @c wxEVT_COMMAND_TEXT_MAXLEN
+        already is filled up to the maximal length, a @c wxEVT_TEXT_MAXLEN

         event is sent to notify the program about it (giving it the possibility
         to show an explanatory message, for example) and the extra input is discarded.
 
         event is sent to notify the program about it (giving it the possibility
         to show an explanatory message, for example) and the extra input is discarded.
 


@@ -358,6 +433,13 @@ public:
     */
     virtual void SelectAll();
 
     */
     virtual void SelectAll();
 

+    /**
+        Deselects selected text in the control.
+
+        @since 2.9.5
+    */
+    virtual void SelectNone();
+

     /**
         Sets a hint shown in an empty unfocused text control.
 
     /**
         Sets a hint shown in an empty unfocused text control.
 


@@ -375,9 +457,23 @@ public:
         Notice that hints are known as <em>cue banners</em> under MSW or
         <em>placeholder strings</em> under OS X.
 
         Notice that hints are known as <em>cue banners</em> under MSW or
         <em>placeholder strings</em> under OS X.
 

+        @remarks For the platforms without native hints support (and currently
+            only the MSW port does have it and even there it is only used under
+            Windows Vista and later only), the implementation has several known
+            limitations. Notably, the hint display will not be properly updated
+            if you change wxTextEntry contents programmatically when the hint
+            is displayed using methods other than SetValue() or ChangeValue()
+            or others which use them internally (e.g. Clear()). In other words,
+            currently you should avoid calling methods such as WriteText() or
+            Replace() when using hints and the text control is empty.
+
+        @remarks Hints can only be used for single line text controls,
+            native multi-line text controls don't support hints under any
+            platform and hence wxWidgets doesn't provide them neither.
+

         @since 2.9.0
      */
         @since 2.9.0
      */

-    virtual void SetHint(const wxString& hint);
+    virtual bool SetHint(const wxString& hint);

 
     /**
         Returns the current hint string.
 
     /**
         Returns the current hint string.


@@ -427,7 +523,7 @@ public:
         0) by this function.
 
         Note that, unlike most other functions changing the controls values,
         0) by this function.
 
         Note that, unlike most other functions changing the controls values,

-        this function generates a @c wxEVT_COMMAND_TEXT_UPDATED event. To avoid
+        this function generates a @c wxEVT_TEXT event. To avoid

         this you can use ChangeValue() instead.
 
         @param value
         this you can use ChangeValue() instead.
 
         @param value