Correct wxImage::Size() again; add unit tests for it.

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

diff --git a/include/wx/stattext.h b/include/wx/stattext.h
index 69cee4fc97e97b5f1af23e10bf77d4856dea6caa..f8d7ede736f1e583001f94456e22f2eb3f91a076 100644 (file)
--- a/include/wx/stattext.h
+++ b/include/wx/stattext.h
@@ -23,15 +23,9 @@
  */
 #define wxST_NO_AUTORESIZE         0x0001
 #define wxST_MARKUP                0x0002
-
-// 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
-};
+#define wxST_ELLIPSIZE_START       0x0004
+#define wxST_ELLIPSIZE_MIDDLE      0x0008
+#define wxST_ELLIPSIZE_END         0x0010
 
 extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticTextNameStr[];
 
@@ -73,10 +67,6 @@ public:
     // using the corresponding entities (< > " ' &)
     static wxString EscapeMarkup(const wxString& str);
 
-    // replaces parts of the string with ellipsis if needed
-    static wxString Ellipsize(const wxString& label, const wxDC& dc,
-                              wxEllipsizeMode mode, int maxWidth);
-
 protected:      // functions required for wxST_ELLIPSIZE_* support
 
     // choose the default border for this window
@@ -104,7 +94,7 @@ protected:      // functions required for wxST_ELLIPSIZE_* support
     virtual void DoSetLabel(const wxString& WXUNUSED(str)) { }
 
 private:
-    DECLARE_NO_COPY_CLASS(wxStaticTextBase)
+    wxDECLARE_NO_COPY_CLASS(wxStaticTextBase);
 };
 
 // see wx/generic/stattextg.h for the explanation