X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ecf902bc836f2808444b34eff48cdb12f289460..bcfa2b31849b797d5a0660b6a80c330f243a0211:/include/wx/stattext.h diff --git a/include/wx/stattext.h b/include/wx/stattext.h index cf49abca92..4ac8badb07 100644 --- a/include/wx/stattext.h +++ b/include/wx/stattext.h @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// // Name: stattext.h // Purpose: wxStaticText base header -// Author: wxWidgets Team +// Author: Julian Smart // Modified by: // Created: -// Copyright: (c) wxWidgets Team +// Copyright: (c) Julian Smart // RCS-ID: $Id$ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -18,13 +18,23 @@ #include "wx/control.h" -extern WXDLLEXPORT_DATA(const wxChar*) wxStaticTextNameStr; +extern WXDLLEXPORT_DATA(const wxChar) wxStaticTextNameStr[]; class WXDLLEXPORT wxStaticTextBase : public wxControl { public: wxStaticTextBase() { } + // in wxGTK wxStaticText doesn't derive from wxStaticTextBase so we have to + // declare this function directly in gtk header +#if !defined(__WXGTK__) || defined(__WXUNIVERSAL__) + // wrap the text of the control so that no line is longer than the given + // width (if possible: this function won't break words) + // + // NB: implemented in dlgcmn.cpp for now + void Wrap(int width); +#endif // ! native __WXGTK__ + // overriden base virtuals virtual bool AcceptsFocus() const { return false; } virtual bool HasTransparentBackground() { return true; }