undid previous commit, the person who reported it retracted his claim

[wxWidgets.git] / include / wx / sizer.h

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index d406d059b6277571fb5008b9a30536be3b0cc7a3..3857f28d25f7496cfd8ed0b12a1ae75c56fdd720 100644 (file)
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -12,7 +12,7 @@
 #ifndef __WXSIZER_H__
 #define __WXSIZER_H__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "sizer.h"
 #endif
 
@@ -184,7 +184,7 @@ public:
 
     virtual void Layout();
 
-    void Fit( wxWindow *window );
+    wxSize Fit( wxWindow *window );
     void FitInside( wxWindow *window );
     void SetSizeHints( wxWindow *window );
     void SetVirtualSizeHints( wxWindow *window );
@@ -244,6 +244,9 @@ protected:
     int    m_vgap;
     int    m_hgap;
 
+    // return the number of total items and the number of columns and rows
+    int CalcRowsCols(int& rows, int& cols) const;
+
     void SetItemBounds( wxSizerItem *item, int x, int y, int w, int h );
 
 private: