undo the last change as it results in buildbot configuration error

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

diff --git a/interface/wx/control.h b/interface/wx/control.h
index 68f220590fdb4c1e0de5c350553f3b9482ba8eba..2d56ad3c609a1955ecaea54241ff81cffdc826c5 100644 (file)
--- a/interface/wx/control.h
+++ b/interface/wx/control.h
@@ -6,14 +6,42 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

+/**
+    Flags used by wxControl::Ellipsize function.
+*/
+enum wxEllipsizeFlags
+{
+    /// With this flag when calculating the size of the passed string, mnemonics
+    /// characters (see wxControl::SetLabel) will be automatically reduced to a
+    /// single character.
+    /// This leads to correct calculations only if the string passed to Ellipsize()
+    /// will be used with wxControl::SetLabel. If you don't want ampersand to
+    /// be interpreted as mnemonics (e.g. because you use wxControl::SetLabelText)
+    /// then don't use this flag.
+    wxELLIPSIZE_PROCESS_MNEMONICS = 1,
+
+    /// This flag tells wxControl::Ellipsize to calculate the width of tab
+    /// characters @c '\\t' as 6 spaces.
+    wxELLIPSIZE_EXPAND_TAB = 2,
+
+    /// The default flags for wxControl::Ellipsize.
+    wxELLIPSIZE_DEFAULT_FLAGS = wxELLIPSIZE_PROCESS_MNEMONICS|wxELLIPSIZE_EXPAND_TAB
+};
+
+

 /**
     The different ellipsization modes supported by the
     wxControl::Ellipsize function.
 */
 enum wxEllipsizeMode
 {
 /**
     The different ellipsization modes supported by the
     wxControl::Ellipsize function.
 */
 enum wxEllipsizeMode
 {

+    /// Put the ellipsis at the start of the string, if the string needs ellipsization.

     wxELLIPSIZE_START,
     wxELLIPSIZE_START,

+
+    /// Put the ellipsis in the middle of the string, if the string needs ellipsization.

     wxELLIPSIZE_MIDDLE,
     wxELLIPSIZE_MIDDLE,

+
+    /// Put the ellipsis at the end of the string, if the string needs ellipsization.

     wxELLIPSIZE_END
 };
 
     wxELLIPSIZE_END
 };
 


@@ -25,6 +53,16 @@ enum wxEllipsizeMode
     A control is generally a small window which processes user input and/or
     displays one or more item of data.
 
     A control is generally a small window which processes user input and/or
     displays one or more item of data.
 

+    @beginEventEmissionTable{wxClipboardTextEvent}
+    @event{EVT_TEXT_COPY(id, func)}
+           Some or all of the controls content was copied to the clipboard.
+    @event{EVT_TEXT_CUT(id, func)}
+           Some or all of the controls content was cut (i.e. copied and
+           deleted).
+    @event{EVT_TEXT_PASTE(id, func)}
+           Clipboard content was pasted into the control.
+    @endEventTable
+

     @library{wxcore}
     @category{ctrl}
 
     @library{wxcore}
     @category{ctrl}
 


@@ -53,9 +91,12 @@ public:
             The ellipsization modes. See ::wxEllipsizeMode.
         @param maxWidth
             The maximum width of the returned string in pixels.
             The ellipsization modes. See ::wxEllipsizeMode.
         @param maxWidth
             The maximum width of the returned string in pixels.

+        @param flags
+            One or more of the ::wxEllipsize

     */
     static wxString Ellipsize(const wxString& label, const wxDC& dc,
     */
     static wxString Ellipsize(const wxString& label, const wxDC& dc,

-                              wxEllipsizeMode mode, int maxWidth);
+                              wxEllipsizeMode mode, int maxWidth,
+                              int flags = wxELLIPSIZE_DEFAULT_FLAGS);

 
     /**
         Returns the control's text.
 
     /**
         Returns the control's text.