Not Logged In
|
Login
|
Register
Home
|
News
|
Projects
|
Releases
Bugs
|
RFE
|
Repositories
|
Help
projects
/
xestiaab
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
frmContactEditor: Check save was successful before closing
[xestiaab/.git]
/
source
/
contacteditor
/
frmContactEditor-Logo.cpp
diff --git
a/source/contacteditor/frmContactEditor-Logo.cpp
b/source/contacteditor/frmContactEditor-Logo.cpp
index
cf9e3f4
..
e4f7c96
100644
(file)
--- 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;
long longSelected = -1;
int intSelectedData = 0;
- if (!GetSelectedItem(lboLogos,
+ if (
lboLogos->GetItemCount() == 0 ||
!GetSelectedItem(lboLogos,
&longSelected,
&intSelectedData)){
return;
&longSelected,
&intSelectedData)){
return;
@@
-46,8
+46,7
@@
void frmContactEditor::LoadLogo( wxListEvent& event )
wxMemoryInputStream istream(base64dec.c_str(), (size_t)base64dec.size());
wxImage photo;
wxMemoryInputStream istream(base64dec.c_str(), (size_t)base64dec.size());
wxImage photo;
- //wxMemoryInputStream istream(base64dec, (size_t)base64dec.size());
-
+
if (pictypeiter->second == wxT("image/jpeg")){
if (!photo.LoadFile(istream, wxBITMAP_TYPE_JPEG)){
if (pictypeiter->second == wxT("image/jpeg")){
if (!photo.LoadFile(istream, wxBITMAP_TYPE_JPEG)){
@@
-87,12
+86,9
@@
void frmContactEditor::AddLogo( wxCommandEvent& event )
{
// Bring up the window to add a logo.
{
// Bring up the window to add a logo.
-
- int intResult = 0;
-
+
frmContactEditorPicture *frameCELogo = new frmContactEditorPicture ( this );
frameCELogo->SetEditorMode(FALSE);
frmContactEditorPicture *frameCELogo = new frmContactEditorPicture ( this );
frameCELogo->SetEditorMode(FALSE);
- intResult = GetLastInt(&ContactEditorData.LogosList);
frameCELogo->SetupPointers(&ContactEditorData.LogosList,
&ContactEditorData.LogosListAltID,
&ContactEditorData.LogosListPID,
frameCELogo->SetupPointers(&ContactEditorData.LogosList,
&ContactEditorData.LogosListAltID,
&ContactEditorData.LogosListPID,
@@
-108,7
+104,8
@@
void frmContactEditor::AddLogo( wxCommandEvent& event )
frameCELogo->ShowModal();
delete frameCELogo;
frameCELogo = NULL;
frameCELogo->ShowModal();
delete frameCELogo;
frameCELogo = NULL;
-
+ intValueSeek++;
+
}
void frmContactEditor::ModifyLogo( wxCommandEvent& event )
}
void frmContactEditor::ModifyLogo( wxCommandEvent& event )
@@
-119,7
+116,7
@@
void frmContactEditor::ModifyLogo( wxCommandEvent& event )
long longSelected = -1;
int intSelectedData = 0;
long longSelected = -1;
int intSelectedData = 0;
- if (!GetSelectedItem(lboLogos,
+ if (
lboLogos->GetItemCount() == 0 ||
!GetSelectedItem(lboLogos,
&longSelected,
&intSelectedData)){
return;
&longSelected,
&intSelectedData)){
return;
@@
-153,7
+150,7
@@
void frmContactEditor::DeleteLogo( wxCommandEvent& event )
long longSelected = -1;
int intSelectedData = 0;
long longSelected = -1;
int intSelectedData = 0;
- if (!GetSelectedItem(lboLogos,
+ if (
lboLogos->GetItemCount() == 0 ||
!GetSelectedItem(lboLogos,
&longSelected,
&intSelectedData)){
return;
&longSelected,
&intSelectedData)){
return;
@@
-182,7
+179,7
@@
void frmContactEditor::SaveLogo( wxCommandEvent &event )
long longSelected = -1;
int intSelectedData = 0;
long longSelected = -1;
int intSelectedData = 0;
- if (!GetSelectedItem(lboLogos,
+ if (
lboLogos->GetItemCount() == 0 ||
!GetSelectedItem(lboLogos,
&longSelected,
&intSelectedData)){
&longSelected,
&intSelectedData)){
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy