X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6418cb93022a02da40be0e50aea3d5615074fb71..b668a73527cd08aae1321bfb1c604c9b96fffbed:/include/wx/notebook.h diff --git a/include/wx/notebook.h b/include/wx/notebook.h index 4dea9653ef..f1e119ff4a 100644 --- a/include/wx/notebook.h +++ b/include/wx/notebook.h @@ -38,50 +38,61 @@ private: }; // ---------------------------------------------------------------------------- -// event macros +// event types and macros for them // ---------------------------------------------------------------------------- +#if defined(__BORLANDC__) && defined(__WIN16__) + // For 16-bit BC++, these 2 would be identical otherwise (truncated) + #define wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED wxEVT_COMMAND_NB_PAGE_CHANGED + #define wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING wxEVT_COMMAND_NB_PAGE_CHANGING +#endif + +BEGIN_DECLARE_EVENT_TYPES() + DECLARE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, 802) + DECLARE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, 803) +END_DECLARE_EVENT_TYPES() + typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&); // Truncation in 16-bit BC++ means we need to define these differently #if defined(__BORLANDC__) && defined(__WIN16__) #define EVT_NOTEBOOK_PAGE_CHANGED(id, fn) \ - { \ - wxEVT_COMMAND_NB_PAGE_CHANGED, \ + DECLARE_EVENT_TABLE_ENTRY( \ + wxEVT_COMMAND_NB_PAGE_CHANGED, \ id, \ -1, \ (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn, \ NULL \ - }, + ), #define EVT_NOTEBOOK_PAGE_CHANGING(id, fn) \ - { \ - wxEVT_COMMAND_NB_PAGE_CHANGING, \ + DECLARE_EVENT_TABLE_ENTRY( \ + wxEVT_COMMAND_NB_PAGE_CHANGING, \ id, \ -1, \ (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn, \ NULL \ - }, + ), #else #define EVT_NOTEBOOK_PAGE_CHANGED(id, fn) \ - { \ + DECLARE_EVENT_TABLE_ENTRY( \ wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, \ id, \ -1, \ (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn, \ NULL \ - }, + ), #define EVT_NOTEBOOK_PAGE_CHANGING(id, fn) \ - { \ + DECLARE_EVENT_TABLE_ENTRY( \ wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, \ id, \ -1, \ (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn, \ NULL \ - }, + ), #endif @@ -102,7 +113,7 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&); #elif defined(__WXQT__) #include "wx/qt/notebook.h" #elif defined(__WXMAC__) - #include "wx/generic/notebook.h" + #include "wx/mac/notebook.h" #elif defined(__WXPM__) #include "wx/os2/notebook.h" #elif defined(__WXSTUBS__)