From f01717c80b9468f63ecf810433b44f9b1c6ef0cf Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Fri, 26 Sep 2008 13:26:56 +0000
Subject: [PATCH] Patch level         : 10.0 Files correlati     : xi.dll
 Ricompilazione Demo : [ ] Commento            : Resi meno profondi i bottoni
 dei listbox/querybox

git-svn-id: svn://10.65.10.50/trunk@17309 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 xi/xi.c      | 31 ++++++++++++++++++++-----------
 xi/xilm3.c   |  1 +
 xi/xiutils.c |  4 ++--
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/xi/xi.c b/xi/xi.c
index 6191ac5de..7df67c4c6 100755
--- a/xi/xi.c
+++ b/xi/xi.c
@@ -719,7 +719,7 @@ do_edit_menu( XI_OBJ * itf, XinEvent * ep )
                     break;
                   }
               }
-
+/* Che programmatore cazzone!
               while ( size-- > 0 )
               {
                 XinEvent ev;
@@ -730,6 +730,19 @@ do_edit_menu( XI_OBJ * itf, XinEvent * ep )
                 xi_event( win, &ev );
                 XinWindowPaintForce( win );
               }
+*/
+              if (size) // Molto meglio cosi!
+              {
+                XinEvent ev;
+                MEMCLEAR( ev );
+                ev.type = XinEventCharacter;
+                while ( size-- > 0 )
+                {
+                  ev.v.character.ch = ( unsigned char ) *p++;
+                  xi_event( win, &ev );
+                }
+              }
+
               itf->v.itf->pasting = FALSE;
               XinMemoryFree( cb );
             }
@@ -1184,6 +1197,7 @@ xi_draw_field_button( XI_OBJ * xi_obj )
   const XinColor color_light = aga_get_pref(AGA_PREF_BTN_COLOR_LIGHT);
   const XinColor color_ctrl = aga_get_pref(AGA_PREF_BTN_COLOR_CTRL);
   const XinColor color_dark = aga_get_pref(AGA_PREF_BTN_COLOR_DARK);
+  const int button_depth = 1;
 
 #if XIWS != XIWS_WM
   int x,
@@ -1204,27 +1218,22 @@ xi_draw_field_button( XI_OBJ * xi_obj )
   xi_set_clip( win, NULL );
 #if XIWS != XIWS_WM
   r = fd->btn_rct;
-  r.top++;
-  r.left++;
-  r.bottom--;
-  r.right--;
+  xi_inflate_rect( &r, -1 );
+
   if ( ( BOOLEAN ) xi_get_pref( XI_PREF_3D_LOOK ) )
-    xi_draw_3d_rect(win, &r, fd->down, 2, color_light, color_ctrl, color_dark);
+    xi_draw_3d_rect(win, &r, fd->down, button_depth, color_light, color_ctrl, color_dark);
   else
   {
     XinWindowBrushSet( win, &white_cbrush );
     XinWindowPenSet( win, &hollow_cpen );
     xi_draw_rect( win, &r );
   }
-// Guy was here
+// Guy was here: center icon in button
   x = (r.left+r.right)/2-16; // x = r.left + 3;
   y = (r.top+r.bottom)/2-16; // y = r.top + 2;
   
   cr = r;
-  cr.top += 2;
-  cr.left += 2;
-  cr.bottom -= 2;
-  cr.right -= 2;
+  xi_inflate_rect( &cr, -button_depth );
   xi_set_clip( win, &cr );
   if ( fd->button_bitmap != NULL )
     xi_bitmap_draw( fd->button_bitmap, win, &cr, &cr, FALSE );
diff --git a/xi/xilm3.c b/xi/xilm3.c
index f178bae1b..7fb3790cc 100755
--- a/xi/xilm3.c
+++ b/xi/xilm3.c
@@ -3004,6 +3004,7 @@ draw_lm( LM lm, BOOLEAN update )
     lm_black_cpen.fore_color = XI_COLOR_BLACK;
     lm_black_cpen.pattern = XinPenSolid;
     XinWindowDrawToolsNormalGet( &lm_normal_ctools );
+    lm_tools_inited = TRUE; // Added by Guy :-(
   }
 
   /***********************************************************************/
diff --git a/xi/xiutils.c b/xi/xiutils.c
index 5c9052e7a..e7a81a927 100755
--- a/xi/xiutils.c
+++ b/xi/xiutils.c
@@ -21,7 +21,7 @@
 
 #if XIWS == XIWS_WM
 #define STX_VERT_FUDGE 0
-#define BORDER_WIDTH 8
+//Gia' definito altrove! #define BORDER_WIDTH 8
 #define EDIT_BORDER_WIDTH_Y 0
 #define EDIT_BORDER_SPACE_Y 0
 #define BORDER_WIDTH_X 8
@@ -30,7 +30,7 @@
 #define BORDER_SPACE_Y 0
 #else
 #define STX_VERT_FUDGE 6
-#define BORDER_WIDTH 2
+//Gia' definito altrove! #define BORDER_WIDTH 2
 #define EDIT_BORDER_WIDTH_Y 1
 #define EDIT_BORDER_SPACE_Y 1
 #define BORDER_WIDTH_X 1