a tentatively better fix for the problem of patch 1456060: don't use m_linesPerPage...

[wxWidgets.git] / src / common / dlgcmn.cpp

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index 04338fc9600c3bb9a3d49042ccee9156246bfa2b..64011f46c77c7c2445f691cd9c63b4cc0aef1a3c 100644 (file)
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -262,13 +262,15 @@ private:
     wxString m_text;
 };
 
     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__)
 void
 #if defined(__WXGTK__) && !defined(__WXUNIVERSAL__)

-wxStaticText
+wxStaticText::

 #else
 #else

-wxStaticTextBase
+wxStaticTextBase::

 #endif
 #endif

-::Wrap(int width)
+Wrap(int width)

 {
     wxLabelWrapper wrapper;
     wrapper.WrapLabel(this, width);
 {
     wxLabelWrapper wrapper;
     wrapper.WrapLabel(this, width);