non-osx methods bracketed

[wxWidgets.git] / include / wx / univ / statusbr.h

diff --git a/include/wx/univ/statusbr.h b/include/wx/univ/statusbr.h
index 96ba5b6299196197aabb0545043ce1d226483548..85baa6e44fd904ff9c760469084ee6ac142450dd 100644 (file)
--- a/include/wx/univ/statusbr.h
+++ b/include/wx/univ/statusbr.h
@@ -12,11 +12,12 @@
 #ifndef _WX_UNIV_STATUSBR_H_
 #define _WX_UNIV_STATUSBR_H_
 
 #ifndef _WX_UNIV_STATUSBR_H_
 #define _WX_UNIV_STATUSBR_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "univstatusbr.h"
 #endif
 
 #include "wx/univ/inpcons.h"
     #pragma interface "univstatusbr.h"
 #endif
 
 #include "wx/univ/inpcons.h"

+#include "wx/arrstr.h"

 
 // ----------------------------------------------------------------------------
 // wxStatusBar: a window near the bottom of the frame used for status info
 
 // ----------------------------------------------------------------------------
 // wxStatusBar: a window near the bottom of the frame used for status info


@@ -88,6 +89,7 @@ protected:
     // also updates m_widthsAbs if necessary
     wxRect GetTotalFieldRect(wxCoord *borderBetweenFields);
 
     // also updates m_widthsAbs if necessary
     wxRect GetTotalFieldRect(wxCoord *borderBetweenFields);
 

+    // get the rect for this field without ani side effects (see code)

     wxRect DoGetFieldRect(int n) const;
 
     // refresh the given field
     wxRect DoGetFieldRect(int n) const;
 
     // refresh the given field