From a01d16defe4b7feddb43e33c192d36e13b89ee31 Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Fri, 6 Mar 2009 12:07:16 +0000
Subject: [PATCH] Patch level         : 10.252 Files correlati     : xvaga.dll
 Ricompilazione Demo : [ ] Commento            : Migliorata selezione del
 colore nero

git-svn-id: svn://10.65.10.50/trunk@18432 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 xvaga/xvaga.cpp   | 14 +++++---------
 xvaga/xvtmail.cpp |  3 +--
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/xvaga/xvaga.cpp b/xvaga/xvaga.cpp
index baf1bdaed..f146b46b2 100755
--- a/xvaga/xvaga.cpp
+++ b/xvaga/xvaga.cpp
@@ -818,7 +818,10 @@ COLOR xvt_dm_post_choose_color(WINDOW win, COLOR xc)
   CAST_WIN(win, w);
   wxColourDialog dialog(&w, &cd);
   if (dialog.ShowModal() == wxID_OK)
+  {
     xc = MAKE_XVT_COLOR(dialog.GetColourData().GetColour());
+    if (xc == 0) xc = COLOR_BLACK; // 0x000000 confonde XI, mentre con 0x07000000 e' a suo agio
+  }
 
   return xc;
 }
@@ -2980,10 +2983,7 @@ BOOLEAN xvt_rect_set_pos(RCT *rctp, PNT pos)
 	{
 		const short w = rctp->right-rctp->left;
 		const short h = rctp->bottom-rctp->top;
-		rctp->left = pos.h;
-		rctp->top = pos.v;
-		rctp->right = pos.h + w;
-		rctp->bottom = pos.v + h;
+    xvt_rect_set(rctp, pos.h, pos.v, pos.h + w, pos.v + h);
 	}
 	return ok;
 }
@@ -4294,13 +4294,9 @@ long xvt_vobj_get_data(WINDOW win)
 
 RCT* xvt_vobj_get_outer_rect(WINDOW win, RCT *rctp)
 {
-	XVT_ASSERT(rctp != NULL);
 	CAST_WIN(win, w);
 	const wxRect rct = w.GetRect();
-	rctp->left   = rct.x;	
-  rctp->top    = rct.y;
-  rctp->right  = rct.GetRight();
-  rctp->bottom = rct.GetBottom();
+  xvt_rect_set(rctp, rct.x, rct.y, rct.GetRight(), rct.GetBottom());
 	return rctp;
 }
 
diff --git a/xvaga/xvtmail.cpp b/xvaga/xvtmail.cpp
index ee1c84c84..25af77c84 100755
--- a/xvaga/xvtmail.cpp
+++ b/xvaga/xvtmail.cpp
@@ -8,8 +8,7 @@
 BOOLEAN xvt_mail_send(const char* to, const char* cc, const char* ccn,
                       const char* subject, const char* msg, 
                       const char* attach, BOOLEAN ui)
-{
-  
+{  
   wxStringTokenizer tokTo(to, _T(";"));
 	wxMailMessage Msg(subject, tokTo.GetNextToken(), msg);