Menu
▾
▴
[Hugin-cvs] hugin/src/hugin ImageCache.cpp, 1.51, 1.52 TextKillFocusHandler.cpp, 1.7, 1.8 OptimizePanel.cpp, 1.38, 1.39 CPImageCtrl.cpp, 1.54, 1.55 CPEditorPanel.cpp, 1.119, 1.120 LensPanel.cpp, 1.96, 1.97
Update of /cvsroot/hugin/hugin/src/hugin In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv17254 Modified Files: ImageCache.cpp TextKillFocusHandler.cpp OptimizePanel.cpp CPImageCtrl.cpp CPEditorPanel.cpp LensPanel.cpp Log Message: Compatibility with non-2.4 builds of wxWidgets 2.5 onwards especially 2.7.0 Index: ImageCache.cpp =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/ImageCache.cpp,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- ImageCache.cpp 11 Aug 2006 18:36:28 -0000 1.51 +++ ImageCache.cpp 14 Aug 2006 21:32:48 -0000 1.52 @@ -783,7 +783,7 @@ double ratio = (double)image->GetWidth() / image->GetHeight(); small_image = image->Scale(w, (int) (w/ratio)); - wxImage * tmp = new wxImage( &small_image ); + wxImage * tmp = new wxImage( small_image ); Entry * e = new Entry(tmp, entry->origType, entry->linear); images[name] = e; DEBUG_INFO ( "created small image: " << name); Index: OptimizePanel.cpp =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/OptimizePanel.cpp,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- OptimizePanel.cpp 12 Aug 2006 15:17:13 -0000 1.38 +++ OptimizePanel.cpp 14 Aug 2006 21:32:48 -0000 1.39 @@ -110,7 +110,7 @@ // } wxCommandEvent dummy; - dummy.m_commandInt = m_mode_cb->GetSelection(); + dummy.SetInt(m_mode_cb->GetSelection()); OnChangeMode(dummy); // observe the panorama @@ -368,7 +368,7 @@ // update automatic checkmarks wxCommandEvent dummy; - dummy.m_commandInt = m_mode_cb->GetSelection(); + dummy.SetInt(m_mode_cb->GetSelection()); OnChangeMode(dummy); } Index: TextKillFocusHandler.cpp =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/TextKillFocusHandler.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- TextKillFocusHandler.cpp 10 Nov 2004 08:36:53 -0000 1.7 +++ TextKillFocusHandler.cpp 14 Aug 2006 21:32:48 -0000 1.8 @@ -48,8 +48,8 @@ // need to get id of the eve if (dirty) { DEBUG_DEBUG("forwarding focus change"); - wxCommandEvent cmdEvt(wxEVT_COMMAND_TEXT_ENTER, e.m_id); - cmdEvt.m_eventObject = e.m_eventObject; + wxCommandEvent cmdEvt(wxEVT_COMMAND_TEXT_ENTER, e.GetId()); + cmdEvt.SetEventObject(e.GetEventObject()); m_parent->ProcessEvent(cmdEvt); dirty = false; } Index: CPImageCtrl.cpp =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/CPImageCtrl.cpp,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- CPImageCtrl.cpp 9 Aug 2006 20:55:39 -0000 1.54 +++ CPImageCtrl.cpp 14 Aug 2006 21:32:48 -0000 1.55 @@ -380,7 +380,7 @@ DEBUG_DEBUG("src image size " << imageSize.GetHeight() << "x" << imageSize.GetWidth()); if (getScaleFactor() == 1.0) { - bitmap = wxBitmap(img); + bitmap = wxBitmap(*img); } else { imageSize.SetWidth( scale(imageSize.GetWidth()) ); imageSize.SetHeight( scale(imageSize.GetHeight()) ); Index: LensPanel.cpp =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/LensPanel.cpp,v retrieving revision 1.96 retrieving revision 1.97 diff -u -d -r1.96 -r1.97 --- LensPanel.cpp 9 Aug 2006 20:55:39 -0000 1.96 +++ LensPanel.cpp 14 Aug 2006 21:32:48 -0000 1.97 @@ -433,34 +433,34 @@ DEBUG_TRACE("") if (m_selectedImages.size() > 0) { string varname; - DEBUG_TRACE (" var changed for control with id:" << e.m_id); - if (e.m_id == XRCID("lens_val_a")) { + DEBUG_TRACE (" var changed for control with id:" << e.GetId()); + if (e.GetId() == XRCID("lens_val_a")) { varname = "a"; - } else if (e.m_id == XRCID("lens_val_b")) { + } else if (e.GetId() == XRCID("lens_val_b")) { varname = "b"; - } else if (e.m_id == XRCID("lens_val_c")) { + } else if (e.GetId() == XRCID("lens_val_c")) { varname = "c"; - } else if (e.m_id == XRCID("lens_val_d")) { + } else if (e.GetId() == XRCID("lens_val_d")) { varname = "d"; - } else if (e.m_id == XRCID("lens_val_e")) { + } else if (e.GetId() == XRCID("lens_val_e")) { varname = "e"; - } else if (e.m_id == XRCID("lens_val_g")) { + } else if (e.GetId() == XRCID("lens_val_g")) { varname = "g"; - } else if (e.m_id == XRCID("lens_val_t")) { + } else if (e.GetId() == XRCID("lens_val_t")) { varname = "t"; - } else if (e.m_id == XRCID("lens_val_v")) { + } else if (e.GetId() == XRCID("lens_val_v")) { varname = "v"; - } else if (e.m_id == XRCID("lens_val_K0a")) { + } else if (e.GetId() == XRCID("lens_val_K0a")) { varname = "K0a"; - } else if (e.m_id == XRCID("lens_val_K0b")) { + } else if (e.GetId() == XRCID("lens_val_K0b")) { varname = "K0b"; - } else if (e.m_id == XRCID("lens_val_K1a")) { + } else if (e.GetId() == XRCID("lens_val_K1a")) { varname = "K1a"; - } else if (e.m_id == XRCID("lens_val_K1b")) { + } else if (e.GetId() == XRCID("lens_val_K1b")) { varname = "K1b"; - } else if (e.m_id == XRCID("lens_val_K2a")) { + } else if (e.GetId() == XRCID("lens_val_K2a")) { varname = "K2a"; - } else if (e.m_id == XRCID("lens_val_K2b")) { + } else if (e.GetId() == XRCID("lens_val_K2b")) { varname = "K2b"; } else { // not reachable @@ -492,29 +492,29 @@ if (m_selectedLenses.size() > 0) { DEBUG_TRACE (""); std::vector<std::string> varnames; - if (e.m_id == XRCID("lens_inherit_a")) { + if (e.GetId() == XRCID("lens_inherit_a")) { varnames.push_back("a"); - } else if (e.m_id == XRCID("lens_inherit_b")) { + } else if (e.GetId() == XRCID("lens_inherit_b")) { varnames.push_back("b"); - } else if (e.m_id == XRCID("lens_inherit_c")) { + } else if (e.GetId() == XRCID("lens_inherit_c")) { varnames.push_back("c"); - } else if (e.m_id == XRCID("lens_inherit_d")) { + } else if (e.GetId() == XRCID("lens_inherit_d")) { varnames.push_back("d"); - } else if (e.m_id == XRCID("lens_inherit_e")) { + } else if (e.GetId() == XRCID("lens_inherit_e")) { varnames.push_back("e"); - } else if (e.m_id == XRCID("lens_inherit_g")) { + } else if (e.GetId() == XRCID("lens_inherit_g")) { varnames.push_back("g"); - } else if (e.m_id == XRCID("lens_inherit_t")) { + } else if (e.GetId() == XRCID("lens_inherit_t")) { varnames.push_back("t"); - } else if (e.m_id == XRCID("lens_inherit_v")) { + } else if (e.GetId() == XRCID("lens_inherit_v")) { varnames.push_back("v"); - } else if (e.m_id == XRCID("lens_inherit_K0")) { + } else if (e.GetId() == XRCID("lens_inherit_K0")) { varnames.push_back("K0a"); varnames.push_back("K0b"); - } else if (e.m_id == XRCID("lens_inherit_K1")) { + } else if (e.GetId() == XRCID("lens_inherit_K1")) { varnames.push_back("K1a"); varnames.push_back("K1b"); - } else if (e.m_id == XRCID("lens_inherit_K2")) { + } else if (e.GetId() == XRCID("lens_inherit_K2")) { varnames.push_back("K2a"); varnames.push_back("K2b"); } else { Index: CPEditorPanel.cpp =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/CPEditorPanel.cpp,v retrieving revision 1.119 retrieving revision 1.120 diff -u -d -r1.119 -r1.120 --- CPEditorPanel.cpp 10 Aug 2006 18:08:50 -0000 1.119 +++ CPEditorPanel.cpp 14 Aug 2006 21:32:48 -0000 1.120 @@ -240,7 +240,7 @@ // apply selection from xrc file wxCommandEvent dummy; - dummy.m_commandInt = XRCCTRL(*this,"cp_editor_zoom_box",wxComboBox)->GetSelection(); + dummy.SetInt(XRCCTRL(*this,"cp_editor_zoom_box",wxComboBox)->GetSelection()); OnZoom(dummy); @@ -1831,7 +1831,7 @@ if (cpCreationState != NO_POINT) { // reset zoom to previous setting wxCommandEvent tmpEvt; - tmpEvt.m_commandInt = XRCCTRL(*this,"cp_editor_zoom_box",wxComboBox)->GetSelection(); + tmpEvt.SetInt(XRCCTRL(*this,"cp_editor_zoom_box",wxComboBox)->GetSelection()); OnZoom(tmpEvt); m_leftImg->clearNewPoint(); m_rightImg->clearNewPoint(); |