X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/10199e27d54df4a0a2a7b2577645ce4561e8ed5f..42b6a61ef6680602b4893a39e4a42d66bcb2f2a8:/include/wx/notebook.h diff --git a/include/wx/notebook.h b/include/wx/notebook.h index 0a05ec9120..eb2b8af14e 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 @@ -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,12 @@ 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(__WXCOCOA__) + #include "wx/generic/notebook.h" #elif defined(__WXPM__) #include "wx/os2/notebook.h" -#elif defined(__WXSTUBS__) - #include "wx/stubs/notebook.h" #endif #endif // wxUSE_NOTEBOOK