X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/897b24cf5ca5ca41734c79f7092104921e0c8cae..33f9f48e207eae2de6f5572c5af85eb5ec8030dd:/src/common/dlgcmn.cpp diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp index 04338fc960..56f113c20a 100644 --- a/src/common/dlgcmn.cpp +++ b/src/common/dlgcmn.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: common/dlgcmn.cpp +// Name: src/common/dlgcmn.cpp // Purpose: common (to all ports) wxDialog functions // Author: Vadim Zeitlin // Modified by: @@ -24,15 +24,15 @@ #pragma hdrstop #endif +#include "wx/dialog.h" + #ifndef WX_PRECOMP #include "wx/button.h" - #include "wx/dialog.h" #include "wx/dcclient.h" #include "wx/intl.h" #include "wx/settings.h" #include "wx/stattext.h" #include "wx/sizer.h" - #include "wx/button.h" #include "wx/containr.h" #endif @@ -262,13 +262,15 @@ private: wxString m_text; }; +// NB: don't "factor out" the scope operator, SGI MIPSpro 7.3 (but not 7.4) +// gets confused if it doesn't immediately follow the class name void #if defined(__WXGTK__) && !defined(__WXUNIVERSAL__) -wxStaticText +wxStaticText:: #else -wxStaticTextBase +wxStaticTextBase:: #endif -::Wrap(int width) +Wrap(int width) { wxLabelWrapper wrapper; wrapper.WrapLabel(this, width);