From: Pablo d'A. <da...@us...> - 2006-08-19 06:58:56
|
Update of /cvsroot/hugin/hugin/src/hugin In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv23637/hugin Modified Files: CPEditorPanel.cpp CPImageCtrl.cpp Log Message: bugfix: On OSX, one pressing on Del, 'g' or 'f' were doubled. Now 'f' just finetunes once. added busy cursor during 'g' key feature Index: CPImageCtrl.cpp =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/CPImageCtrl.cpp,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- CPImageCtrl.cpp 17 Aug 2006 22:10:05 -0000 1.56 +++ CPImageCtrl.cpp 19 Aug 2006 06:58:51 -0000 1.57 @@ -872,7 +872,9 @@ << e.GetEventObject()); // forward all keys to our parent //GetParent()->GetEventHandler()->ProcessEvent(e); +#ifndef __WXMAC__ m_editPanel->GetEventHandler()->ProcessEvent(e); +#endif } e.Skip(); } Index: CPEditorPanel.cpp =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/CPEditorPanel.cpp,v retrieving revision 1.122 retrieving revision 1.123 diff -u -d -r1.122 -r1.123 --- CPEditorPanel.cpp 18 Aug 2006 12:44:17 -0000 1.122 +++ CPEditorPanel.cpp 19 Aug 2006 06:58:51 -0000 1.123 @@ -1725,10 +1725,11 @@ } try { - DEBUG_DEBUG("corner threshold: " << th << " scale: " << scale); - GlobalCmdHist::getInstance().addCommand( - new wxAddCtrlPointGridCmd(*m_pano, m_leftImageNr, m_rightImageNr, scale, th) - ); + wxBusyCursor busy; + DEBUG_DEBUG("corner threshold: " << th << " scale: " << scale); + GlobalCmdHist::getInstance().addCommand( + new wxAddCtrlPointGridCmd(*m_pano, m_leftImageNr, m_rightImageNr, scale, th) + ); } catch (std::exception & e) { wxLogError(_("Error duing control point creation:\n") + wxString(e.what(), *wxConvCurrent)); } |