X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c507b171af7fb2e0ed36fca546b7951c8ab5dd2..138618acb91e2a879a735c5806f9f728220f14df:/include/wx/generic/notebook.h diff --git a/include/wx/generic/notebook.h b/include/wx/generic/notebook.h index b1d9660346..3743ac8484 100644 --- a/include/wx/generic/notebook.h +++ b/include/wx/generic/notebook.h @@ -11,7 +11,7 @@ #ifndef _WX_NOTEBOOK_H_ #define _WX_NOTEBOOK_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "notebook.h" #endif @@ -31,13 +31,6 @@ class WXDLLEXPORT wxImageList; class WXDLLEXPORT wxWindow; -// Already defined in wx/notebook.h -#if 0 -// array of notebook pages -typedef wxWindow wxNotebookPage; // so far, any window can be a page -WX_DEFINE_ARRAY(wxNotebookPage *, wxArrayPages); -#endif - // ---------------------------------------------------------------------------- // wxNotebook // ---------------------------------------------------------------------------- @@ -173,11 +166,6 @@ protected: // helper functions void ChangePage(int nOldSel, int nSel); // change pages -#if 0 - wxImageList *m_pImageList; // we can have an associated image list - wxArrayPages m_aPages; // array of pages -#endif - int m_nSelection; // the current selection (-1 if none) wxTabView* m_tabView;