X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bfc6fde4b1dd5bfd8ae22839ff9a69cf24eb9120..90d26317f7613d64c81a5b09b578c5144c2bab1b:/include/wx/generic/tabg.h?ds=sidebyside

diff --git a/include/wx/generic/tabg.h b/include/wx/generic/tabg.h
index c636650433..047cd38779 100644
--- a/include/wx/generic/tabg.h
+++ b/include/wx/generic/tabg.h
@@ -12,7 +12,7 @@
 #ifndef __TABGH_G__
 #define __TABGH_G__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "tabg.h"
 #endif
 
@@ -21,6 +21,7 @@
 #include "wx/hash.h"
 #include "wx/string.h"
 #include "wx/dialog.h"
+#include "wx/panel.h"
 
 class WXDLLEXPORT wxTabView;
 
@@ -102,7 +103,7 @@ public:
   wxTabView(long style = wxTAB_STYLE_DRAW_BOX | wxTAB_STYLE_COLOUR_INTERIOR);
   ~wxTabView();
 
-  inline int GetNumberOfLayers() const { return m_layers.Number(); }
+  inline int GetNumberOfLayers() const { return m_layers.GetCount(); }
   inline wxList& GetLayers() { return m_layers; }
 
   inline void SetWindow(wxWindow* wnd) { m_window = wnd; }
@@ -120,7 +121,7 @@ public:
   wxString GetTabText(int id) const;
 
   // Layout tabs (optional, e.g. if resizing window)
-  void Layout(void);
+  void LayoutTabs();
 
   // Draw all tabs
   virtual void Draw(wxDC& dc);