X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor-Logo.cpp;h=e4f7c966f8a2532cf9ded2fdc1512b2f6a94c29a;hb=ee9b71949005734012f18251774807c38b989ae2;hp=e75a6a0f571eb0a9c0333032428fad65c445d7f9;hpb=fb9cf55d990f7419dd7ae3ce9fdaadf07059b9cb;p=xestiaab%2F.git diff --git a/source/contacteditor/frmContactEditor-Logo.cpp b/source/contacteditor/frmContactEditor-Logo.cpp index e75a6a0..e4f7c96 100644 --- a/source/contacteditor/frmContactEditor-Logo.cpp +++ b/source/contacteditor/frmContactEditor-Logo.cpp @@ -28,7 +28,7 @@ void frmContactEditor::LoadLogo( wxListEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboLogos, + if (lboLogos->GetItemCount() == 0 || !GetSelectedItem(lboLogos, &longSelected, &intSelectedData)){ return; @@ -86,12 +86,9 @@ void frmContactEditor::AddLogo( wxCommandEvent& event ) { // Bring up the window to add a logo. - - int intResult = 0; - + frmContactEditorPicture *frameCELogo = new frmContactEditorPicture ( this ); frameCELogo->SetEditorMode(FALSE); - intResult = GetLastInt(&ContactEditorData.LogosList); frameCELogo->SetupPointers(&ContactEditorData.LogosList, &ContactEditorData.LogosListAltID, &ContactEditorData.LogosListPID, @@ -107,7 +104,8 @@ void frmContactEditor::AddLogo( wxCommandEvent& event ) frameCELogo->ShowModal(); delete frameCELogo; frameCELogo = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyLogo( wxCommandEvent& event ) @@ -118,7 +116,7 @@ void frmContactEditor::ModifyLogo( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboLogos, + if (lboLogos->GetItemCount() == 0 || !GetSelectedItem(lboLogos, &longSelected, &intSelectedData)){ return; @@ -152,7 +150,7 @@ void frmContactEditor::DeleteLogo( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboLogos, + if (lboLogos->GetItemCount() == 0 || !GetSelectedItem(lboLogos, &longSelected, &intSelectedData)){ return; @@ -181,7 +179,7 @@ void frmContactEditor::SaveLogo( wxCommandEvent &event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboLogos, + if (lboLogos->GetItemCount() == 0 || !GetSelectedItem(lboLogos, &longSelected, &intSelectedData)){