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(*): Call Layout on szrGeneral after adding priorty control
[xestiaab/.git]
/
source
/
contacteditor
/
frmContactEditor-Logo.cpp
diff --git
a/source/contacteditor/frmContactEditor-Logo.cpp
b/source/contacteditor/frmContactEditor-Logo.cpp
index
2f02a8a
..
ce5649a
100644
(file)
--- a/
source/contacteditor/frmContactEditor-Logo.cpp
+++ b/
source/contacteditor/frmContactEditor-Logo.cpp
@@
-23,10
+23,12
@@
void frmContactEditor::LoadLogo( wxListEvent& event )
{
void frmContactEditor::LoadLogo( wxListEvent& event )
{
+ // Load the logo.
+
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;
@@
-44,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)){
@@
-83,11
+84,11
@@
void frmContactEditor::LoadLogo( wxListEvent& event )
void frmContactEditor::AddLogo( wxCommandEvent& event )
{
void frmContactEditor::AddLogo( wxCommandEvent& event )
{
- int intResult = 0;
-
+
+ // Bring up the window to add a logo.
+
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,
@@
-109,10
+110,12
@@
void frmContactEditor::AddLogo( wxCommandEvent& event )
void frmContactEditor::ModifyLogo( wxCommandEvent& event )
{
void frmContactEditor::ModifyLogo( wxCommandEvent& event )
{
+ // Bring up the window to modify a logo.
+
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;
@@
-141,10
+144,12
@@
void frmContactEditor::ModifyLogo( wxCommandEvent& event )
void frmContactEditor::DeleteLogo( wxCommandEvent& event )
{
void frmContactEditor::DeleteLogo( wxCommandEvent& event )
{
+ // Bring up a window to delete a logo.
+
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;
@@
-168,10
+173,12
@@
void frmContactEditor::DeleteLogo( wxCommandEvent& event )
void frmContactEditor::SaveLogo( wxCommandEvent &event )
{
void frmContactEditor::SaveLogo( wxCommandEvent &event )
{
+ // Save the logo to a file.
+
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