X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/07b8d7ecc39cfc6cce17156b91c6de1cfb56ce5b..ab590906ba1542923101ad4bbda843a57579af19:/include/wx/notebook.h diff --git a/include/wx/notebook.h b/include/wx/notebook.h index ac8e965466..35b0cc2efb 100644 --- a/include/wx/notebook.h +++ b/include/wx/notebook.h @@ -12,7 +12,7 @@ #ifndef _WX_NOTEBOOK_H_BASE_ #define _WX_NOTEBOOK_H_BASE_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "notebookbase.h" #endif @@ -26,8 +26,7 @@ #include "wx/control.h" #include "wx/dynarray.h" - -class WXDLLEXPORT wxImageList; +#include "wx/imaglist.h" // ---------------------------------------------------------------------------- // types @@ -155,7 +154,7 @@ public: protected: // remove the page and return a pointer to it - virtual wxNotebookPage *DoRemovePage(int page) = 0; + virtual wxNotebookPage *DoRemovePage(int page); // common part of all ctors void Init(); @@ -166,6 +165,8 @@ protected: wxArrayPages m_pages; // array of pages wxImageList *m_imageList; // we can have an associated image list bool m_ownsImageList; // true if we must delete m_imageList + + DECLARE_NO_COPY_CLASS(wxNotebookBase) }; // ---------------------------------------------------------------------------- @@ -273,14 +274,10 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&); #include "wx/generic/notebook.h" #elif defined(__WXGTK__) #include "wx/gtk/notebook.h" -#elif defined(__WXQT__) - #include "wx/qt/notebook.h" #elif defined(__WXMAC__) #include "wx/mac/notebook.h" #elif defined(__WXPM__) #include "wx/os2/notebook.h" -#elif defined(__WXSTUBS__) - #include "wx/stubs/notebook.h" #endif #endif // wxUSE_NOTEBOOK