From: <hug...@li...> - 2011-01-29 12:05:04
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/2f3941e43176 changeset: 4909:2f3941e43176 user: tmodes date: Sat Jan 29 13:04:43 2011 +0100 description: Changed declaration of custom events types diffstat: src/hugin1/hugin/ImagesList.cpp | 14 ++++++++++++-- src/hugin1/hugin/ImagesList.h | 14 ++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diffs (48 lines): diff -r 8f7664fa6f0d -r 2f3941e43176 src/hugin1/hugin/ImagesList.cpp --- a/src/hugin1/hugin/ImagesList.cpp Sat Jan 29 11:38:58 2011 +0100 +++ b/src/hugin1/hugin/ImagesList.cpp Sat Jan 29 13:04:43 2011 +0100 @@ -40,8 +40,18 @@ using namespace PT; using namespace utils; -wxDEFINE_EVENT(EVT_IMAGE_ADD,wxCommandEvent); -wxDEFINE_EVENT(EVT_IMAGE_DEL,wxCommandEvent); +#if wxCHECK_VERSION(2,9,0) + wxDEFINE_EVENT(EVT_IMAGE_ADD,wxCommandEvent); + wxDEFINE_EVENT(EVT_IMAGE_DEL,wxCommandEvent); +#else +#if _WINDOWS && defined Hugin_shared + DEFINE_LOCAL_EVENT_TYPE(EVT_IMAGE_ADD) + DEFINE_LOCAL_EVENT_TYPE(EVT_IMAGE_DEL) +#else + DEFINE_EVENT_TYPE(EVT_IMAGE_ADD) + DEFINE_EVENT_TYPE(EVT_IMAGE_DEL) +#endif +#endif //------------------------------------------------------------------------------ diff -r 8f7664fa6f0d -r 2f3941e43176 src/hugin1/hugin/ImagesList.h --- a/src/hugin1/hugin/ImagesList.h Sat Jan 29 11:38:58 2011 +0100 +++ b/src/hugin1/hugin/ImagesList.h Sat Jan 29 13:04:43 2011 +0100 @@ -34,8 +34,18 @@ using namespace PT; //declare 2 event types to communicate with parent about adding/deleting images -wxDECLARE_EVENT(EVT_IMAGE_ADD,wxCommandEvent); -wxDECLARE_EVENT(EVT_IMAGE_DEL,wxCommandEvent); +#if wxCHECK_VERSION(2,9,0) + wxDECLARE_EVENT(EVT_IMAGE_ADD,wxCommandEvent); + wxDECLARE_EVENT(EVT_IMAGE_DEL,wxCommandEvent); +#else +#if _WINDOWS && defined Hugin_shared + DECLARE_LOCAL_EVENT_TYPE(EVT_IMAGE_ADD,-1) + DECLARE_LOCAL_EVENT_TYPE(EVT_IMAGE_DEL,-1) +#else + DECLARE_EVENT_TYPE(EVT_IMAGE_ADD,-1) + DECLARE_EVENT_TYPE(EVT_IMAGE_DEL,-1) +#endif +#endif /** multi use list. * |