added wxStandardPaths::GetAppDocumentsDir() and use it by default for loading/saving...

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

diff --git a/interface/wx/stattext.h b/interface/wx/stattext.h
index aa5097f25b78e7071ac0f6e3e6f84dff9a952933..613d99661a3e7d342148ebde71dc3159cf846c95 100644 (file)
--- a/interface/wx/stattext.h
+++ b/interface/wx/stattext.h
@@ -6,21 +6,6 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-/**
-    The different ellipsization modes supported by wxStaticText and by
-    wxStaticText::Ellipsize function.
-
-    @note
-    The members of this enum are used both as window styles for wxStaticText
-    and both as enumeration values for wxStaticText::Ellipsize static function.
-*/
-enum wxEllipsizeMode
-{
-    wxST_ELLIPSIZE_START = 0x0004,
-    wxST_ELLIPSIZE_MIDDLE = 0x0008,
-    wxST_ELLIPSIZE_END = 0x0010
-};
-

 /**
     @class wxStaticText
 
 /**
     @class wxStaticText
 


@@ -30,29 +15,29 @@ enum wxEllipsizeMode
 
     @beginStyleTable
     @style{wxALIGN_LEFT}
 
     @beginStyleTable
     @style{wxALIGN_LEFT}

-           Align the text to the left
+           Align the text to the left.

     @style{wxALIGN_RIGHT}
     @style{wxALIGN_RIGHT}

-           Align the text to the right
+           Align the text to the right.

     @style{wxALIGN_CENTRE}
     @style{wxALIGN_CENTRE}

-           Center the text (horizontally)
+           Center the text (horizontally).

     @style{wxST_NO_AUTORESIZE}
            By default, the control will adjust its size to exactly fit to the
            size of the text when  SetLabel is called. If this style flag is
            given, the control will not change its size (this style is
            especially useful with controls which also have wxALIGN_RIGHT or
            CENTER style because otherwise they won't make sense any longer
     @style{wxST_NO_AUTORESIZE}
            By default, the control will adjust its size to exactly fit to the
            size of the text when  SetLabel is called. If this style flag is
            given, the control will not change its size (this style is
            especially useful with controls which also have wxALIGN_RIGHT or
            CENTER style because otherwise they won't make sense any longer

-           after a call to SetLabel)
+           after a call to SetLabel).

     @style{wxST_ELLIPSIZE_START}
            If the labeltext width exceeds the control width, replace the beginning
     @style{wxST_ELLIPSIZE_START}
            If the labeltext width exceeds the control width, replace the beginning

-           of the label with an ellipsis
+           of the label with an ellipsis; uses wxControl::Ellipsize.

     @style{wxST_ELLIPSIZE_MIDDLE}
            If the label text width exceeds the control width, replace the middle
     @style{wxST_ELLIPSIZE_MIDDLE}
            If the label text width exceeds the control width, replace the middle

-           of the label with an ellipsis
+           of the label with an ellipsis; uses wxControl::Ellipsize.

     @style{wxST_ELLIPSIZE_END}
            If the label text width exceeds the control width, replace the end
     @style{wxST_ELLIPSIZE_END}
            If the label text width exceeds the control width, replace the end

-           of the label with an ellipsis
+           of the label with an ellipsis; uses wxControl::Ellipsize.

     @style{wxST_MARKUP}
     @style{wxST_MARKUP}

-           Support markup in the label; see SetLabel() for more information
+           Support markup in the label; see SetLabel() for more information.

     @endStyleTable
 
     @library{wxcore}
     @endStyleTable
 
     @library{wxcore}


@@ -111,23 +96,6 @@ public:
     */
     static wxString EscapeMarkup(const wxString& str);
 
     */
     static wxString EscapeMarkup(const wxString& str);
 

-    /**
-        Replaces parts of the @a label string with ellipsis, if needed, so
-        that it doesn't exceed @a maxWidth.
-
-        @param label
-            The string to ellipsize
-        @param dc
-            The DC used to retrieve the character widths through the
-            wxDC::GetPartialTextExtents() function.
-        @param mode
-            The ellipsization modes. See ::wxEllipsizeMode.
-        @param maxWidth
-            The maximum width of the returned string in pixels.
-    */
-    static wxString Ellipsize(const wxString& label, const wxDC& dc,
-                              wxEllipsizeMode mode, int maxWidth);
-

     /**
         Returns the contents of the control.
 
     /**
         Returns the contents of the control.
 


@@ -223,12 +191,12 @@ public:
 
         <TABLE>
             <TR>
 
         <TABLE>
             <TR>

-                <TD>@b Special character</TD>
-                <TD>@b Escape as</TD>
+                <TD><b>Special character</b></TD>
+                <TD><b>Escape as</b></TD>

             </TR>
             <TR>
                 <TD>@c &amp;</TD>
             </TR>
             <TR>
                 <TD>@c &amp;</TD>

-                <TD>@c &amp;amp; or as &amp;&amp;</TD>
+                <TD>@c &amp;amp; or as @c &amp;&amp;</TD>

             </TR>
             <TR>
                 <TD>@c &apos;</TD>
             </TR>
             <TR>
                 <TD>@c &apos;</TD>