From: <hug...@li...> - 2012-05-21 16:07:34
|
branch: gui_overhaul details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/b5eb073834a6 changeset: 5817:b5eb073834a6 user: tmodes date: Mon May 21 18:08:50 2012 +0200 description: Fixes a warning with wxWidgets 2.9 diffstat: src/hugin1/hugin/GLPreviewFrame.cpp | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diffs (17 lines): diff -r 5cd003be6eb4 -r b5eb073834a6 src/hugin1/hugin/GLPreviewFrame.cpp --- a/src/hugin1/hugin/GLPreviewFrame.cpp Mon May 21 18:08:22 2012 +0200 +++ b/src/hugin1/hugin/GLPreviewFrame.cpp Mon May 21 18:08:50 2012 +0200 @@ -1180,8 +1180,13 @@ m_oldProjFormat = opts.getProjection(); +#if wxCHECK_VERSION(2,9,2) + XRCCTRL(*this,"preview_autocrop_tool",wxButton)->Enable(activeImgs); + XRCCTRL(*this,"preview_stack_autocrop_tool",wxButton)->Enable(activeImgs); +#else XRCCTRL(*this,"preview_autocrop_tool",wxBitmapButton)->Enable(activeImgs); XRCCTRL(*this,"preview_stack_autocrop_tool",wxBitmapButton)->Enable(activeImgs); +#endif m_ROILeftTxt->SetValue(wxString::Format(wxT("%d"), opts.getROI().left() )); m_ROIRightTxt->SetValue(wxString::Format(wxT("%d"), opts.getROI().right() )); m_ROITopTxt->SetValue(wxString::Format(wxT("%d"), opts.getROI().top() )); |
From: <hug...@li...> - 2012-06-26 19:51:36
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/a9a3cbdecfda changeset: 5874:a9a3cbdecfda user: tmodes date: Mon May 21 18:08:50 2012 +0200 description: Fixes a warning with wxWidgets 2.9 diffstat: src/hugin1/hugin/GLPreviewFrame.cpp | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diffs (17 lines): diff -r 86da8d5c8e18 -r a9a3cbdecfda src/hugin1/hugin/GLPreviewFrame.cpp --- a/src/hugin1/hugin/GLPreviewFrame.cpp Sat May 19 11:34:09 2012 +0200 +++ b/src/hugin1/hugin/GLPreviewFrame.cpp Mon May 21 18:08:50 2012 +0200 @@ -985,8 +985,13 @@ m_oldProjFormat = opts.getProjection(); +#if wxCHECK_VERSION(2,9,2) + XRCCTRL(*this,"preview_autocrop_tool",wxButton)->Enable(activeImgs); + XRCCTRL(*this,"preview_stack_autocrop_tool",wxButton)->Enable(activeImgs); +#else XRCCTRL(*this,"preview_autocrop_tool",wxBitmapButton)->Enable(activeImgs); XRCCTRL(*this,"preview_stack_autocrop_tool",wxBitmapButton)->Enable(activeImgs); +#endif m_ROILeftTxt->SetValue(wxString::Format(wxT("%d"), opts.getROI().left() )); m_ROIRightTxt->SetValue(wxString::Format(wxT("%d"), opts.getROI().right() )); m_ROITopTxt->SetValue(wxString::Format(wxT("%d"), opts.getROI().top() )); |