From: <hug...@li...> - 2011-08-28 15:35:37
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/b57c510eb3ef changeset: 5536:b57c510eb3ef user: tmodes date: Sun Aug 28 17:21:16 2011 +0200 description: More general version checking which works also with coming wxWidgets 3.0 diffstat: src/hugin1/base_wx/PTWXDlg.cpp | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (27 lines): diff -r a100bed081e8 -r b57c510eb3ef src/hugin1/base_wx/PTWXDlg.cpp --- a/src/hugin1/base_wx/PTWXDlg.cpp Sun Aug 28 17:20:30 2011 +0200 +++ b/src/hugin1/base_wx/PTWXDlg.cpp Sun Aug 28 17:21:16 2011 +0200 @@ -130,9 +130,9 @@ if (dlg == 0) { return FALSE; } -#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 8 +#if wxCHECK_VERSION(2,8,0) dlg->Pulse(wxString(argument, wxConvLocal)); -#elif wxMAJOR_VERSION == 2 +#else dlg->Update(0, wxString(argument, wxConvLocal)); #endif } @@ -152,9 +152,9 @@ { sprintf( text,"%s%s", mainMessage, &(argument[1]) ); } -#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 8 +#if wxCHECK_VERSION(2,8,0) cont = dlg->Pulse(wxString(argument, wxConvLocal)); -#elif wxMAJOR_VERSION == 2 +#else cont = dlg->Update(1, wxString(argument, wxConvLocal)); #endif if (! cont) { |