From: Ippei U. <ip...@us...> - 2005-06-02 15:02:00
|
Update of /cvsroot/hugin/hugin/src/hugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15711 Modified Files: CPEditorPanel.cpp Log Message: Mac: The choices too should be disabled if there are no images Index: CPEditorPanel.cpp =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/CPEditorPanel.cpp,v retrieving revision 1.100 retrieving revision 1.101 diff -u -d -r1.100 -r1.101 --- CPEditorPanel.cpp 2 Jun 2005 07:50:53 -0000 1.100 +++ CPEditorPanel.cpp 2 Jun 2005 15:01:50 -0000 1.101 @@ -250,6 +250,10 @@ XRCCTRL(*this, "cp_editor_zoom_box", wxComboBox)->Disable(); XRCCTRL(*this, "cp_editor_previous_img", wxButton)->Disable(); XRCCTRL(*this, "cp_editor_next_img", wxButton)->Disable(); +#ifdef HUGIN_CP_IMG_CHOICE + m_leftChoice->Disable(); + m_rightChoice->Disable(); +#endif // observe the panorama m_pano->addObserver(this); @@ -378,7 +382,7 @@ m_rightImageNr = imgNr; m_rightFile = ""; if (m_fineTuneFrame) { - m_fineTuneFrame->GetLeftImg()->Clear(); + m_fineTuneFrame->GetRightImg()->Clear(); } changeState(NO_POINT); UpdateDisplay(); @@ -1117,6 +1121,10 @@ XRCCTRL(*this, "cp_editor_zoom_box", wxComboBox)->Disable(); XRCCTRL(*this, "cp_editor_previous_img", wxButton)->Disable(); XRCCTRL(*this, "cp_editor_next_img", wxButton)->Disable(); +#ifdef HUGIN_CP_IMG_CHOICE + m_leftChoice->Disable(); + m_rightChoice->Disable(); +#endif } else { // enable controls m_cpModeChoice->Enable(); @@ -1127,7 +1135,11 @@ XRCCTRL(*this, "cp_editor_zoom_box", wxComboBox)->Enable(); XRCCTRL(*this, "cp_editor_previous_img", wxButton)->Enable(); XRCCTRL(*this, "cp_editor_next_img", wxButton)->Enable(); - +#ifdef HUGIN_CP_IMG_CHOICE + m_leftChoice->Enable(); + m_rightChoice->Enable(); +#endif + // FIXME: lets hope that nobody holds references to these images.. ImageCache::getInstance().softFlush(); |