From 586bed94461ee212e159c6423d16798a20b43687 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 28 Apr 2012 22:25:15 +0000 Subject: [PATCH] Make it possible to forward declare wx{Choice,Tool,Tree}bookEvent again. Don't use typedef for these classes as it makes it impossible to forward-declare them, just use #define instead as we already do for wxListbookEvent and wxNotebookEvent. This allows forward declaration and is also more consistent. Closes #12242. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/choicebk.h | 2 +- include/wx/toolbook.h | 2 +- include/wx/treebook.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wx/choicebk.h b/include/wx/choicebk.h index 0539b353dd..972a97c6a0 100644 --- a/include/wx/choicebk.h +++ b/include/wx/choicebk.h @@ -111,7 +111,7 @@ private: // ---------------------------------------------------------------------------- // wxChoicebookEvent is obsolete and defined for compatibility only -typedef wxBookCtrlEvent wxChoicebookEvent; +#define wxChoicebookEvent wxBookCtrlEvent typedef wxBookCtrlEventFunction wxChoicebookEventFunction; #define wxChoicebookEventHandler(func) wxBookCtrlEventHandler(func) diff --git a/include/wx/toolbook.h b/include/wx/toolbook.h index bfe6211e8f..f3e3e3aad2 100644 --- a/include/wx/toolbook.h +++ b/include/wx/toolbook.h @@ -128,7 +128,7 @@ private: // ---------------------------------------------------------------------------- // wxToolbookEvent is obsolete and defined for compatibility only -typedef wxBookCtrlEvent wxToolbookEvent; +#define wxToolbookEvent wxBookCtrlEvent typedef wxBookCtrlEventFunction wxToolbookEventFunction; #define wxToolbookEventHandler(func) wxBookCtrlEventHandler(func) diff --git a/include/wx/treebook.h b/include/wx/treebook.h index 30bc563e0d..a6bd61d2d1 100644 --- a/include/wx/treebook.h +++ b/include/wx/treebook.h @@ -229,7 +229,7 @@ private: // ---------------------------------------------------------------------------- // wxTreebookEvent is obsolete and defined for compatibility only -typedef wxBookCtrlEvent wxTreebookEvent; +#define wxTreebookEvent wxBookCtrlEvent typedef wxBookCtrlEventFunction wxTreebookEventFunction; #define wxTreebookEventHandler(func) wxBookCtrlEventHandler(func)