X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e450aa692b887adbae4350896f6c90ec8e1368e3..609533d54db83ee9d85fe7ad9589521fcf3f6be1:/include/wx/notebook.h diff --git a/include/wx/notebook.h b/include/wx/notebook.h index ec0dfa5ba3..371065064c 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_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "notebookbase.h" #endif @@ -48,7 +48,7 @@ enum // array of notebook pages typedef wxWindow wxNotebookPage; // so far, any window can be a page -WX_DEFINE_EXPORTED_ARRAY(wxNotebookPage *, wxArrayPages); +WX_DEFINE_EXPORTED_ARRAY_NO_PTR(wxNotebookPage *, wxArrayPages); #define wxNOTEBOOK_NAME _T("notebook") @@ -159,7 +159,8 @@ public: // hit test, returns which tab is hit and, optionally, where (icon, label) // (not implemented on all platforms) - virtual int HitTest(const wxPoint& pt, long *flags = NULL) const + virtual int HitTest(const wxPoint& WXUNUSED(pt), + long * WXUNUSED(flags) = NULL) const { return wxNOT_FOUND; } @@ -218,7 +219,7 @@ private: int m_nSel, // currently selected page m_nOldSel; // previously selected page - DECLARE_DYNAMIC_CLASS(wxNotebookEvent) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxNotebookEvent) }; // ----------------------------------------------------------------------------