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

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

diff --git a/interface/wx/stattext.h b/interface/wx/stattext.h
index 0f9b5cad5077dd4ab6d1fb5000b815bbd0f14f7d..19525e0ae7faaea9e9896c0a0e787d0277939290 100644 (file)
--- a/interface/wx/stattext.h
+++ b/interface/wx/stattext.h
@@ -2,10 +2,14 @@
 // Name:        stattext.h
 // Purpose:     interface of wxStaticText
 // Author:      wxWidgets team
 // Name:        stattext.h
 // Purpose:     interface of wxStaticText
 // Author:      wxWidgets team

-// RCS-ID:      $Id$

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+#define wxST_NO_AUTORESIZE         0x0001
+#define wxST_ELLIPSIZE_START       0x0004
+#define wxST_ELLIPSIZE_MIDDLE      0x0008
+#define wxST_ELLIPSIZE_END         0x0010
+

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


@@ -20,14 +24,14 @@
            Align the text to the left.
     @style{wxALIGN_RIGHT}
            Align the text to the right.
            Align the text to the left.
     @style{wxALIGN_RIGHT}
            Align the text to the right.

-    @style{wxALIGN_CENTRE}
+    @style{wxALIGN_CENTRE_HORIZONTAL}

            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 the @c wxALIGN_RIGHT or
            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 the @c wxALIGN_RIGHT or

-           the @c wxALIGN_CENTRE style because otherwise they won't make sense any
+           the @c wxALIGN_CENTRE_HORIZONTAL style because otherwise they won't make sense any

            longer after a call to SetLabel()).
     @style{wxST_ELLIPSIZE_START}
            If the labeltext width exceeds the control width, replace the beginning
            longer after a call to SetLabel()).
     @style{wxST_ELLIPSIZE_START}
            If the labeltext width exceeds the control width, replace the beginning


@@ -42,7 +46,7 @@
 
     @library{wxcore}
     @category{ctrl}
 
     @library{wxcore}
     @category{ctrl}

-    @appearance{statictext.png}
+    @appearance{statictext}

 
     @see wxStaticBitmap, wxStaticBox
 */
 
     @see wxStaticBitmap, wxStaticBox
 */