From c2c8d35b42d892d9679c14739658ce80003ba97b Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Wed, 7 Apr 2010 12:30:36 +0000
Subject: [PATCH] 2010-04-07 14:30 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * src/rtl/gtwin/gtwin.c   * src/rtl/gtwvt/gtwvt.c     + Added
 support for setting mouse position.

  * src/rtl/mouseapi.c
    ! Fixed typos in trace messages.
---
 harbour/ChangeLog             |  8 ++++++++
 harbour/src/rtl/gtwin/gtwin.c |  9 +++++++++
 harbour/src/rtl/gtwvt/gtwvt.c | 18 +++++++++++++-----
 harbour/src/rtl/mouseapi.c    |  4 ++--
 4 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 55856ed716..de454a98b6 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,14 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-04-07 14:30 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * src/rtl/gtwin/gtwin.c
+  * src/rtl/gtwvt/gtwvt.c
+    + Added support for setting mouse position.
+
+  * src/rtl/mouseapi.c
+    ! Fixed typos in trace messages.
+
 2010-04-07 14:05 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * src/rtl/fstemp.c
     ! Fixed HB_DIRTEMP() (and low-level equivalent) returning
diff --git a/harbour/src/rtl/gtwin/gtwin.c b/harbour/src/rtl/gtwin/gtwin.c
index 13857603f2..7187de34b1 100644
--- a/harbour/src/rtl/gtwin/gtwin.c
+++ b/harbour/src/rtl/gtwin/gtwin.c
@@ -2011,6 +2011,14 @@ static void hb_gt_win_mouse_GetPos( PHB_GT pGT, int * piRow, int * piCol )
    *piCol = s_mouse_iCol;
 }
 
+static void hb_gt_win_mouse_SetPos( PHB_GT pGT, int iRow, int iCol )
+{
+   HB_SYMBOL_UNUSED( pGT );
+
+   s_mouse_iRow = iRow;
+   s_mouse_iCol = iCol;
+}
+
 static HB_BOOL hb_gt_win_mouse_ButtonState( PHB_GT pGT, int iButton )
 {
    HB_BOOL fReturn = HB_FALSE;
@@ -2135,6 +2143,7 @@ static HB_BOOL hb_gt_FuncInit( PHB_GT_FUNCS pFuncTable )
 
    pFuncTable->MouseIsPresent             = hb_gt_win_mouse_IsPresent;
    pFuncTable->MouseGetPos                = hb_gt_win_mouse_GetPos;
+   pFuncTable->MouseSetPos                = hb_gt_win_mouse_SetPos;
    pFuncTable->MouseButtonState           = hb_gt_win_mouse_ButtonState;
    pFuncTable->MouseCountButton           = hb_gt_win_mouse_CountButton;
 
diff --git a/harbour/src/rtl/gtwvt/gtwvt.c b/harbour/src/rtl/gtwvt/gtwvt.c
index 51b27a35d6..de4ee7eaef 100644
--- a/harbour/src/rtl/gtwvt/gtwvt.c
+++ b/harbour/src/rtl/gtwvt/gtwvt.c
@@ -661,11 +661,11 @@ static void hb_gt_wvt_FitSize( PHB_GTWVT pWVT )
    }
 
    {
-      HFONT      hOldFont;
-      HFONT      hFont;
-      int        fontHeight;
-      int        fontWidth;
-      int        n;
+      HFONT hOldFont;
+      HFONT hFont;
+      int   fontHeight;
+      int   fontWidth;
+      int   n;
 
       fontHeight = maxHeight / pWVT->ROWS;
       fontWidth  = maxWidth  / pWVT->COLS;
@@ -2063,6 +2063,13 @@ static void hb_gt_wvt_mouse_GetPos( PHB_GT pGT, int * piRow, int * piCol )
    *piCol = pWVT->MousePos.x;
 }
 
+static void hb_gt_wvt_mouse_SetPos( PHB_GT pGT, int iRow, int iCol )
+{
+   HB_TRACE(HB_TR_DEBUG, ("hb_gt_wvt_mouse_SetPos(%p,%i,%i)", pGT, iRow, iCol));
+
+   hb_gt_wvt_SetMousePos( HB_GTWVT_GET( pGT ), iRow, iCol );
+}
+
 static HB_BOOL hb_gt_wvt_mouse_ButtonState( PHB_GT pGT, int iButton )
 {
    HB_TRACE( HB_TR_DEBUG, ("hb_gt_wvt_mouse_ButtonState(%p,%i)", pGT, iButton) );
@@ -3028,6 +3035,7 @@ static HB_BOOL hb_gt_FuncInit( PHB_GT_FUNCS pFuncTable )
 
    pFuncTable->MouseIsPresent       = hb_gt_wvt_mouse_IsPresent;
    pFuncTable->MouseGetPos          = hb_gt_wvt_mouse_GetPos;
+   pFuncTable->MouseSetPos          = hb_gt_wvt_mouse_SetPos;
    pFuncTable->MouseButtonState     = hb_gt_wvt_mouse_ButtonState;
    pFuncTable->MouseCountButton     = hb_gt_wvt_mouse_CountButton;
 
diff --git a/harbour/src/rtl/mouseapi.c b/harbour/src/rtl/mouseapi.c
index a04b482c8b..e3ec999f24 100644
--- a/harbour/src/rtl/mouseapi.c
+++ b/harbour/src/rtl/mouseapi.c
@@ -152,7 +152,7 @@ void hb_mouseGetPos( int * piRow, int * piCol )
 {
    PHB_GT pGT;
 
-   HB_TRACE(HB_TR_DEBUG, ("hb_mouseSetPos(%p, %p)", piRow, piCol));
+   HB_TRACE(HB_TR_DEBUG, ("hb_mouseGetPos(%p, %p)", piRow, piCol));
 
    pGT = hb_gt_Base();
    if( pGT )
@@ -194,7 +194,7 @@ void hb_mouseGetBounds( int * piTop, int * piLeft, int * piBottom, int * piRight
 {
    PHB_GT pGT;
 
-   HB_TRACE(HB_TR_DEBUG, ("hb_mouseSetBounds(%p, %p, %p, %p)", piTop, piLeft, piBottom, piRight));
+   HB_TRACE(HB_TR_DEBUG, ("hb_mouseGetBounds(%p, %p, %p, %p)", piTop, piLeft, piBottom, piRight));
 
    pGT = hb_gt_Base();
    if( pGT )