X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ef0e92205a01c7d0ca6f381cc690cb5d4fa595c9..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/stattext.h diff --git a/include/wx/stattext.h b/include/wx/stattext.h index d23d88d4c1..f8d7ede736 100644 --- a/include/wx/stattext.h +++ b/include/wx/stattext.h @@ -23,12 +23,10 @@ */ #define wxST_NO_AUTORESIZE 0x0001 #define wxST_MARKUP 0x0002 - #define wxST_ELLIPSIZE_START 0x0004 #define wxST_ELLIPSIZE_MIDDLE 0x0008 #define wxST_ELLIPSIZE_END 0x0010 - extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticTextNameStr[]; class WXDLLIMPEXP_CORE wxStaticTextBase : public wxControl @@ -65,11 +63,10 @@ public: // and then returns the cleaned string static wxString RemoveMarkup(const wxString& str); - // escapes the alls special symbols (<>"'&) present inside the given string + // escapes all special symbols (<>"'&) present in the given string // using the corresponding entities (< > " ' &) static wxString EscapeMarkup(const wxString& str); - protected: // functions required for wxST_ELLIPSIZE_* support // choose the default border for this window @@ -97,9 +94,12 @@ 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 +#ifndef wxNO_PORT_STATTEXT_INCLUDE + #if defined(__WXUNIVERSAL__) #include "wx/univ/stattext.h" #elif defined(__WXMSW__) @@ -120,7 +120,8 @@ private: #include "wx/palmos/stattext.h" #endif +#endif // !wxNO_PORT_STATTEXT_INCLUDE + #endif // wxUSE_STATTEXT -#endif - // _WX_STATTEXT_H_BASE_ +#endif // _WX_STATTEXT_H_BASE_