2009-03-13 01:45 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

* contrib/hbwin/wapi_commctrl.c
  * contrib/hbwin/wapi_winuser.c
    ! Lots of non-ANSI C comments converted to ANSI.
      (may I please ask to pay attention to this?)
    ! Fixed WAPI_GETSCROLLRANGE() return value.
    ! non-WinCE compatible functions converted to stubs
      when compiled for WinCE.
    * Formatting.

  * contrib/Makefile
  - contrib/hbgf
  + contrib/examples/hbgf
  * contrib/examples/hbgf/hbgfwin/Makefile
  * contrib/examples/hbgf/hbgfos2/Makefile
  * contrib/examples/hbgf/hbgfgtk/Makefile
  * contrib/examples/hbgf/Makefile
    * hbgf moved from contrib to examples.

  * contrib/examples/Makefile
    * Updated.

harbour/ChangeLog

@@ -8,6 +8,28 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-03-13 01:45 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * contrib/hbwin/wapi_commctrl.c
+  * contrib/hbwin/wapi_winuser.c
+    ! Lots of non-ANSI C comments converted to ANSI.
+      (may I please ask to pay attention to this?)
+    ! Fixed WAPI_GETSCROLLRANGE() return value.
+    ! non-WinCE compatible functions converted to stubs
+      when compiled for WinCE.
+    * Formatting.
+
+  * contrib/Makefile
+  - contrib/hbgf
+  + contrib/examples/hbgf
+  * contrib/examples/hbgf/hbgfwin/Makefile
+  * contrib/examples/hbgf/hbgfos2/Makefile
+  * contrib/examples/hbgf/hbgfgtk/Makefile
+  * contrib/examples/hbgf/Makefile
+    * hbgf moved from contrib to examples.
+
+  * contrib/examples/Makefile
+    * Updated.
+
 2009-03-13 01:36 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * config/dos/owatcom.cf
   * config/win/poccce.cf

harbour/contrib/Makefile

@@ -14,7 +14,6 @@ DIRS=\
 	hbclipsm \
 	hbcrypt \
 	hbct \
-	hbgf \
 	hbgt \
 	hbmisc \
 	hbmzip \

harbour/contrib/examples/Makefile

@@ -6,6 +6,8 @@ ROOT = ../../
 
 DIRS=\
 	guestbk \
+	hbgf \
+	hbsqlit2 \
 	hscript \
 	misc \
 	pe \

harbour/contrib/examples/hbgf/Makefile

@@ -2,7 +2,7 @@
 # $Id$
 #
 
-ROOT = ../../
+ROOT = ../../../
 
 ifeq ($(HB_ARCHITECTURE),win)
 DIRS = hbgfwin

harbour/contrib/examples/hbgf/hbgfgtk/Makefile

@@ -2,7 +2,7 @@
 # $Id$
 #
 
-ROOT = ../../../
+ROOT = ../../../../
 
 LIBNAME=hbgfgtk
 

harbour/contrib/examples/hbgf/hbgfos2/Makefile

@@ -2,7 +2,7 @@
 # $Id$
 #
 
-ROOT = ../../../
+ROOT = ../../../../
 
 LIBNAME=hbgfos2
 

harbour/contrib/examples/hbgf/hbgfwin/Makefile

@@ -2,7 +2,7 @@
 # $Id$
 #
 
-ROOT = ../../../
+ROOT = ../../../../
 
 LIBNAME=hbgfwin
 

harbour/contrib/hbwin/wapi_commctrl.c

@@ -46,6 +46,7 @@
  * If you do not wish that, delete this exception notice.
  *
  */
+
 /*----------------------------------------------------------------------*/
 
 #define HB_OS_WIN_USED
@@ -55,9 +56,9 @@
 #include "hbwapi.h"
 #include <commctrl.h>
 
-/*----------------------------------------------------------------------//
+/*----------------------------------------------------------------------*/
                         BEGIN - ImageList_* - API
-//----------------------------------------------------------------------*/
+/*----------------------------------------------------------------------*/
 /*
 int ImageList_Add( HIMAGELIST himl, HBITMAP hbmImage, HBITMAP hbmMask );
 */
@@ -258,10 +259,10 @@ BOOL ImageList_GetIconSize( HIMAGELIST himl, int *cx, int *cy );
 */
 HB_FUNC( WAPI_IMAGELIST_GETICONSIZE )
 {
-   int cx ;
-   int cy ;
+   int cx;
+   int cy;
 
-   if ( ImageList_GetIconSize( wapi_par_HIMAGELIST( 1 ), &cx, &cy ) )
+   if( ImageList_GetIconSize( wapi_par_HIMAGELIST( 1 ), &cx, &cy ) )
    {
       hb_storni( cx, 2 );
       hb_storni( cy, 3 );
@@ -269,7 +270,7 @@ HB_FUNC( WAPI_IMAGELIST_GETICONSIZE )
    }
    else
    {
-     hb_retl( 0 );
+      hb_retl( 0 );
    }
 }
 /*----------------------------------------------------------------------*/
@@ -287,11 +288,11 @@ BOOL ImageList_GetImageInfo( HIMAGELIST himl, int i, IMAGEINFO *pImageInfo );
 */
 HB_FUNC( WAPI_IMAGELIST_GETIMAGEINFO )
 {
-   IMAGEINFO ii ;
+   IMAGEINFO ii;
 
    if( ImageList_GetImageInfo( wapi_par_HIMAGELIST( 1 ), wapi_par_INT( 2 ), &ii ) )
    {
-      hb_retclen( ( char* ) &ii, sizeof( IMAGEINFO ) );
+      hb_retclen( ( char * ) &ii, sizeof( IMAGEINFO ) );
    }
 }
 /*----------------------------------------------------------------------*/
@@ -459,15 +460,15 @@ HB_FUNC( WAPI_IMAGELIST_WRITEEX )
 {
 }
 #endif
-/*----------------------------------------------------------------------//
-//                            END - ImageList_* - API
-//----------------------------------------------------------------------*/
+/*----------------------------------------------------------------------*/
+/*                            END - ImageList_* - API                   */
+/*----------------------------------------------------------------------*/
 
 
-/*----------------------------------------------------------------------//
+/*----------------------------------------------------------------------*/
                              Tab Control Macros
-//----------------------------------------------------------------------*/
-// Wapi_TabCtrl_InsertItem( hWndTab, nInsertPos, cText, iImageListIndex )
+/*----------------------------------------------------------------------*/
+/* Wapi_TabCtrl_InsertItem( hWndTab, nInsertPos, cText, iImageListIndex ) */
 
 HB_FUNC( WAPI_TABCTRL_INSERTITEM )
 {
@@ -486,13 +487,13 @@ HB_FUNC( WAPI_TABCTRL_INSERTITEM )
 
 HB_FUNC( WAPI_TABCTRL_SETCURSEL )
 {
-   wapi_ret_NI( TabCtrl_SetCurSel( wapi_par_HWND( 1 ) , hb_parni (2) ) );
+   wapi_ret_NI( TabCtrl_SetCurSel( wapi_par_HWND( 1 ) , hb_parni( 2 ) ) );
 }
 /*----------------------------------------------------------------------*/
 
 HB_FUNC( WAPI_TABCTRL_GETCURSEL )
 {
-   wapi_ret_NI( TabCtrl_GetCurSel( wapi_par_HWND( 1 ) ) ) ;
+   wapi_ret_NI( TabCtrl_GetCurSel( wapi_par_HWND( 1 ) ) );
 }
 /*----------------------------------------------------------------------*/
 
@@ -501,13 +502,13 @@ HB_FUNC( WAPI_TABCTRL_GETITEM )
    TC_ITEM item;
    hb_retl( TabCtrl_GetItem( wapi_par_HWND( 1 ), wapi_par_INT( 2 ), &item ) );
 
-   // assign  item to param 3
+   /* assign  item to param 3 */
 }
 /*----------------------------------------------------------------------*/
 
 HB_FUNC( WAPI_TABCTRL_GETITEMCOUNT )
 {
-   wapi_ret_NI( TabCtrl_GetItemCount( wapi_par_HWND( 1 ) ) ) ;
+   wapi_ret_NI( TabCtrl_GetItemCount( wapi_par_HWND( 1 ) ) );
 }
 /*----------------------------------------------------------------------*/
 
@@ -541,28 +542,28 @@ HB_FUNC( WAPI_TABCTRL_GETITEMRECT )
 
 HB_FUNC( WAPI_TABCTRL_GETROWCOUNT )
 {
-   wapi_ret_NI( TabCtrl_GetRowCount( wapi_par_HWND( 1 ) ) ) ;
+   wapi_ret_NI( TabCtrl_GetRowCount( wapi_par_HWND( 1 ) ) );
 }
 /*----------------------------------------------------------------------*/
-// TabCtrl_GetImageList(hwnd)
-// (HIMAGELIST)SNDMSG((hwnd), TCM_GETIMAGELIST, 0, 0L)
+/* TabCtrl_GetImageList(hwnd) */
+/* (HIMAGELIST)SNDMSG((hwnd), TCM_GETIMAGELIST, 0, 0L) */
 
 HB_FUNC( WAPI_TABCTRL_GETIMAGELIST )
 {
-   wapi_ret_NINT( ( LONG ) TabCtrl_GetImageList( wapi_par_HWND( 1 ) ) ) ;
+   wapi_ret_NINT( ( LONG ) TabCtrl_GetImageList( wapi_par_HWND( 1 ) ) );
 }
 /*----------------------------------------------------------------------*/
-// #define TabCtrl_SetImageList(hwnd, himl)
-// (HIMAGELIST)SNDMSG((hwnd), TCM_SETIMAGELIST, 0, (LPARAM)(HIMAGELIST)(himl))
+/* #define TabCtrl_SetImageList(hwnd, himl) */
+/* (HIMAGELIST)SNDMSG((hwnd), TCM_SETIMAGELIST, 0, (LPARAM)(HIMAGELIST)(himl)) */
 
 HB_FUNC( WAPI_TABCTRL_SETIMAGELIST )
 {
    wapi_ret_NINT( ( HB_PTRDIFF ) TabCtrl_SetImageList( wapi_par_HWND( 1 ),
-                                                       wapi_par_HIMAGELIST( 2 ) ) ) ;
+                                                       wapi_par_HIMAGELIST( 2 ) ) );
 }
 /*----------------------------------------------------------------------*/
-// Wapi_TabCtrl_SetItem( hWndTab, nInsertPos, cText, iImageListIndex )
-// (BOOL)SNDMSG((hwnd), TCM_SETITEM, (WPARAM)(int)(iItem), (LPARAM)(TC_ITEM FAR*)(pitem))
+/* Wapi_TabCtrl_SetItem( hWndTab, nInsertPos, cText, iImageListIndex ) */
+/* (BOOL)SNDMSG((hwnd), TCM_SETITEM, (WPARAM)(int)(iItem), (LPARAM)(TC_ITEM FAR*)(pitem)) */
 
 HB_FUNC( WAPI_TABCTRL_SETITEM )
 {
@@ -573,188 +574,203 @@ HB_FUNC( WAPI_TABCTRL_SETITEM )
    item.iImage  = ISNIL( 4 ) ? -1 : wapi_par_INT( 4 );
    item.pszText = szText;
 
-   wapi_ret_L( TabCtrl_SetItem( wapi_par_HWND( 1 ), wapi_par_INT( 2 ), &item ) ) ;
+   wapi_ret_L( TabCtrl_SetItem( wapi_par_HWND( 1 ), wapi_par_INT( 2 ), &item ) );
 
    HB_TCHAR_FREE( szText );
 }
 /*----------------------------------------------------------------------*/
-// TabCtrl_DeleteAllItems(hwnd)
-// (BOOL)SNDMSG((hwnd), TCM_DELETEALLITEMS, 0, 0L)
+/* TabCtrl_DeleteAllItems(hwnd) */
+/* (BOOL)SNDMSG((hwnd), TCM_DELETEALLITEMS, 0, 0L) */
 
 HB_FUNC( WAPI_TABCTRL_DELETEALLITEMS )
 {
    wapi_ret_L( TabCtrl_DeleteAllItems( wapi_par_HWND( 1 ) ) );
 }
 /*----------------------------------------------------------------------*/
-// TabCtrl_DeleteItem(hwnd, i)
-// (BOOL)SNDMSG((hwnd), TCM_DELETEITEM, (WPARAM)(int)(i), 0L)
+/* TabCtrl_DeleteItem(hwnd, i) */
+/* (BOOL)SNDMSG((hwnd), TCM_DELETEITEM, (WPARAM)(int)(i), 0L) */
 
 HB_FUNC( WAPI_TABCTRL_DELETEITEM )
 {
    wapi_ret_L( TabCtrl_DeleteItem( wapi_par_HWND( 1 ), ( WPARAM ) wapi_par_INT( 2 ) ) );
 }
 /*----------------------------------------------------------------------*/
-// TabCtrl_HitTest(hwndTC, pinfo)
-// (int)SNDMSG((hwndTC), TCM_HITTEST, 0, (LPARAM)(TC_HITTESTINFO FAR*)(pinfo))
+/* TabCtrl_HitTest(hwndTC, pinfo) */
+/* (int)SNDMSG((hwndTC), TCM_HITTEST, 0, (LPARAM)(TC_HITTESTINFO FAR*)(pinfo)) */
 
-// waiting for structures
+/* waiting for structures */
 
 HB_FUNC( WAPI_TABCTRL_HITTEST )
 {
-   TCHITTESTINFO tcht ;
+   TCHITTESTINFO tcht;
 
-   hb_parni( TabCtrl_HitTest( wapi_par_HWND( 1 ), &tcht ) ) ;
+   hb_parni( TabCtrl_HitTest( wapi_par_HWND( 1 ), &tcht ) );
 }
 /*----------------------------------------------------------------------*/
-// TabCtrl_SetItemExtra(hwndTC, cb)
-// (BOOL)SNDMSG((hwndTC), TCM_SETITEMEXTRA, (WPARAM)(cb), 0L)
+/* TabCtrl_SetItemExtra(hwndTC, cb) */
+/* (BOOL)SNDMSG((hwndTC), TCM_SETITEMEXTRA, (WPARAM)(cb), 0L) */
 
 HB_FUNC( WAPI_TABCTRL_SETITEMEXTRA )
 {
-   wapi_ret_L( TabCtrl_SetItemExtra( wapi_par_HWND( 1 ), wapi_par_INT( 2 ) ) ) ;
+   wapi_ret_L( TabCtrl_SetItemExtra( wapi_par_HWND( 1 ), wapi_par_INT( 2 ) ) );
 }
 /*----------------------------------------------------------------------*/
-// TabCtrl_AdjustRect(hwnd, bLarger, prc)
-// (int)SNDMSG(hwnd, TCM_ADJUSTRECT, (WPARAM)(BOOL)(bLarger), (LPARAM)(RECT FAR *)prc)
+/* TabCtrl_AdjustRect(hwnd, bLarger, prc) */
+/* (int)SNDMSG(hwnd, TCM_ADJUSTRECT, (WPARAM)(BOOL)(bLarger), (LPARAM)(RECT FAR *)prc) */
 
 HB_FUNC( WAPI_TABCTRL_ADJUSTRECT )
 {
-  RECT rc;
+   if( ISARRAY( 3 ) )
+   {
+      RECT rc;
 
-  if ( ISARRAY(3) )
-  {
-     rc.left   = hb_parnl( 3, 1 );
-     rc.top    = hb_parnl( 3, 2 );
-     rc.right  = hb_parnl( 3, 3 );
-     rc.bottom = hb_parnl( 3, 4 );
+      rc.left   = hb_parnl( 3, 1 );
+      rc.top    = hb_parnl( 3, 2 );
+      rc.right  = hb_parnl( 3, 3 );
+      rc.bottom = hb_parnl( 3, 4 );
 
-     TabCtrl_AdjustRect( wapi_par_HWND( 1 ), wapi_par_BOOL( 2 ), &rc );
+      TabCtrl_AdjustRect( wapi_par_HWND( 1 ), wapi_par_BOOL( 2 ), &rc );
 
-     hb_stornl( rc.left  , 3, 1 );
-     hb_stornl( rc.top   , 3, 2 );
-     hb_stornl( rc.right , 3, 3 );
-     hb_stornl( rc.bottom, 3, 4 );
-  }
+      hb_stornl( rc.left  , 3, 1 );
+      hb_stornl( rc.top   , 3, 2 );
+      hb_stornl( rc.right , 3, 3 );
+      hb_stornl( rc.bottom, 3, 4 );
+   }
 }
 /*----------------------------------------------------------------------*/
-// TabCtrl_SetItemSize(hwnd, x, y)
-// (DWORD)SNDMSG((hwnd), TCM_SETITEMSIZE, 0, MAKELPARAM(x,y))
+/* TabCtrl_SetItemSize(hwnd, x, y) */
+/* (DWORD)SNDMSG((hwnd), TCM_SETITEMSIZE, 0, MAKELPARAM(x,y)) */
 
 HB_FUNC( WAPI_TABCTRL_SETITEMSIZE )
 {
    wapi_ret_NINT( TabCtrl_SetItemSize( wapi_par_HWND( 1 ), wapi_par_INT( 2 ), wapi_par_INT( 3 ) ) );
 }
 /*----------------------------------------------------------------------*/
-// TabCtrl_RemoveImage(hwnd, i)
-// (void)SNDMSG((hwnd), TCM_REMOVEIMAGE, i, 0L)
+/* TabCtrl_RemoveImage(hwnd, i) */
+/* (void)SNDMSG((hwnd), TCM_REMOVEIMAGE, i, 0L) */
 
 HB_FUNC( WAPI_TABCTRL_REMOVEIMAGE )
 {
-   TabCtrl_RemoveImage( wapi_par_HWND( 1 ), wapi_par_INT( 2 ) ) ;
+   TabCtrl_RemoveImage( wapi_par_HWND( 1 ), wapi_par_INT( 2 ) );
 }
 /*----------------------------------------------------------------------*/
-// TabCtrl_SetPadding(hwnd,  cx, cy)
-// (void)SNDMSG((hwnd), TCM_SETPADDING, 0, MAKELPARAM(cx, cy))
+/* TabCtrl_SetPadding(hwnd,  cx, cy) */
+/* (void)SNDMSG((hwnd), TCM_SETPADDING, 0, MAKELPARAM(cx, cy)) */
 
 HB_FUNC( WAPI_TABCTRL_SETPADDING )
 {
-   TabCtrl_SetPadding( wapi_par_HWND( 1 ), wapi_par_INT( 2 ), wapi_par_INT( 3 ) ) ;
+   TabCtrl_SetPadding( wapi_par_HWND( 1 ), wapi_par_INT( 2 ), wapi_par_INT( 3 ) );
 }
 /*----------------------------------------------------------------------*/
-// TabCtrl_GetToolTips(hwnd)
-// (HWND)SNDMSG((hwnd), TCM_GETTOOLTIPS, 0, 0L)
+/* TabCtrl_GetToolTips(hwnd) */
+/* (HWND)SNDMSG((hwnd), TCM_GETTOOLTIPS, 0, 0L) */
 
 HB_FUNC( WAPI_TABCTRL_GETTOOLTIPS )
 {
+#if ! defined(HB_OS_WIN_CE)
    wapi_ret_NINT( ( HB_PTRDIFF ) TabCtrl_GetToolTips( wapi_par_HWND( 1 ) ) );
+#else
+   wapi_ret_NINT( -1 );
+#endif
 }
 /*----------------------------------------------------------------------*/
-// TabCtrl_SetToolTips(hwnd, hwndTT)
-// (void)SNDMSG((hwnd), TCM_SETTOOLTIPS, (WPARAM)(hwndTT), 0L)
+/* TabCtrl_SetToolTips(hwnd, hwndTT) */
+/* (void)SNDMSG((hwnd), TCM_SETTOOLTIPS, (WPARAM)(hwndTT), 0L) */
 
 HB_FUNC( WAPI_TABCTRL_SETTOOLTIPS )
 {
-   TabCtrl_SetToolTips( wapi_par_HWND( 1 ), wapi_par_HWND( 2 ) ) ;
+#if ! defined(HB_OS_WIN_CE)
+   TabCtrl_SetToolTips( wapi_par_HWND( 1 ), wapi_par_HWND( 2 ) );
+#endif
 }
 /*----------------------------------------------------------------------*/
-// TabCtrl_GetCurFocus(hwnd)
-// (int)SNDMSG((hwnd), TCM_GETCURFOCUS, 0, 0)
+/* TabCtrl_GetCurFocus(hwnd) */
+/* (int)SNDMSG((hwnd), TCM_GETCURFOCUS, 0, 0) */
 
 HB_FUNC( WAPI_TABCTRL_GETCURFOCUS )
 {
    wapi_ret_NI( TabCtrl_GetCurFocus( wapi_par_HWND( 1 ) ) );
 }
 /*----------------------------------------------------------------------*/
-// TabCtrl_SetCurFocus(hwnd, i)
-// SNDMSG((hwnd),TCM_SETCURFOCUS, i, 0)
+/* TabCtrl_SetCurFocus(hwnd, i) */
+/* SNDMSG((hwnd),TCM_SETCURFOCUS, i, 0) */
 
 HB_FUNC( WAPI_TABCTRL_SETCURFOCUS )
 {
    TabCtrl_SetCurFocus( wapi_par_HWND( 1 ), wapi_par_INT( 2 ) );
 }
 /*----------------------------------------------------------------------*/
-// TabCtrl_SetMinTabWidth(hwnd, x)
-// (int)SNDMSG((hwnd), TCM_SETMINTABWIDTH, 0, x)
+/* TabCtrl_SetMinTabWidth(hwnd, x) */
+/* (int)SNDMSG((hwnd), TCM_SETMINTABWIDTH, 0, x) */
 
 HB_FUNC( WAPI_TABCTRL_SETMINTABWIDTH )
 {
-   //wapi_ret_NI( TabCtrl_SetMinTabWidth( wapi_par_HWND( 1 ), wapi_par_INT( 2 ) ) );
+   /* wapi_ret_NI( TabCtrl_SetMinTabWidth( wapi_par_HWND( 1 ), wapi_par_INT( 2 ) ) ); */
    wapi_ret_NI( ( int ) SendMessage( wapi_par_HWND( 1 ), TCM_SETMINTABWIDTH, ( WPARAM ) 0, ( LPARAM ) wapi_par_INT( 2 ) ) );
 }
 /*----------------------------------------------------------------------*/
-// TabCtrl_DeselectAll(hwnd, fExcludeFocus)
-// (void)SNDMSG((hwnd), TCM_DESELECTALL, fExcludeFocus, 0)
+/* TabCtrl_DeselectAll(hwnd, fExcludeFocus) */
+/* (void)SNDMSG((hwnd), TCM_DESELECTALL, fExcludeFocus, 0) */
 
 HB_FUNC( WAPI_TABCTRL_DESELECTALL )
 {
-   //TabCtrl_DeselectAll( wapi_par_HWND( 1 ), wapi_par_UINT( 2 ) ) ;
-   SendMessage( wapi_par_HWND( 1 ), TCM_DESELECTALL, ( WPARAM ) wapi_par_UINT( 2 ), ( LPARAM ) 0 ) ;
+   /* TabCtrl_DeselectAll( wapi_par_HWND( 1 ), wapi_par_UINT( 2 ) ); */
+   SendMessage( wapi_par_HWND( 1 ), TCM_DESELECTALL, ( WPARAM ) wapi_par_UINT( 2 ), ( LPARAM ) 0 );
 }
 /*----------------------------------------------------------------------*/
+
 #if (_WIN32_IE >= 0x0400)
-// TabCtrl_HighlightItem(hwnd, i, fHighlight)
-// (BOOL)SNDMSG((hwnd), TCM_HIGHLIGHTITEM, (WPARAM)(i), (LPARAM)MAKELONG (fHighlight, 0))
+
+/* TabCtrl_HighlightItem(hwnd, i, fHighlight) */
+/* (BOOL)SNDMSG((hwnd), TCM_HIGHLIGHTITEM, (WPARAM)(i), (LPARAM)MAKELONG (fHighlight, 0)) */
 
 HB_FUNC( WAPI_TABCTRL_HIGHLIGHTITEM )
 {
    wapi_ret_L( TabCtrl_HighlightItem( wapi_par_HWND( 1 ), wapi_par_INT( 2 ), wapi_par_WORD( 3 ) ) );
 }
 /*----------------------------------------------------------------------*/
-// TabCtrl_SetExtendedStyle(hwnd, dw)
-// (DWORD)SNDMSG((hwnd), TCM_SETEXTENDEDSTYLE, 0, dw)
+/* TabCtrl_SetExtendedStyle(hwnd, dw) */
+/* (DWORD)SNDMSG((hwnd), TCM_SETEXTENDEDSTYLE, 0, dw) */
 
 HB_FUNC( WAPI_TABCTRL_SETEXTENDEDSTYLE )
 {
-   wapi_ret_NINT( TabCtrl_SetExtendedStyle( wapi_par_HWND( 1 ), wapi_par_DWORD( 2 ) ) ) ;
+   wapi_ret_NINT( TabCtrl_SetExtendedStyle( wapi_par_HWND( 1 ), wapi_par_DWORD( 2 ) ) );
 }
 /*----------------------------------------------------------------------*/
-// TabCtrl_GetExtendedStyle(hwnd)
-// (DWORD)SNDMSG((hwnd), TCM_GETEXTENDEDSTYLE, 0, 0)
+/* TabCtrl_GetExtendedStyle(hwnd)
+/* (DWORD)SNDMSG((hwnd), TCM_GETEXTENDEDSTYLE, 0, 0)
 
 HB_FUNC( WAPI_TABCTRL_GETEXTENDEDSTYLE )
 {
-   wapi_ret_NINT( TabCtrl_GetExtendedStyle( wapi_par_HWND( 1 ) ) ) ;
+   wapi_ret_NINT( TabCtrl_GetExtendedStyle( wapi_par_HWND( 1 ) ) );
 }
 /*----------------------------------------------------------------------*/
-// TabCtrl_SetUnicodeFormat(hwnd, fUnicode)
-// (BOOL)SNDMSG((hwnd), TCM_SETUNICODEFORMAT, (WPARAM)(fUnicode), 0)
+/* TabCtrl_SetUnicodeFormat(hwnd, fUnicode) */
+/* (BOOL)SNDMSG((hwnd), TCM_SETUNICODEFORMAT, (WPARAM)(fUnicode), 0) */
 
 HB_FUNC( WAPI_TABCTRL_SETUNICODEFORMAT )
 {
+#if ! defined(HB_OS_WIN_CE)
    wapi_ret_L( TabCtrl_SetUnicodeFormat( wapi_par_HWND( 1 ), wapi_par_BOOL( 2 ) ) );
+#endif
 }
 /*----------------------------------------------------------------------*/
-// TabCtrl_GetUnicodeFormat(hwnd)
-// (BOOL)SNDMSG((hwnd), TCM_GETUNICODEFORMAT, 0, 0)
+/* TabCtrl_GetUnicodeFormat(hwnd) */
+/* (BOOL)SNDMSG((hwnd), TCM_GETUNICODEFORMAT, 0, 0) */
 
 HB_FUNC( WAPI_TABCTRL_GETUNICODEFORMAT )
 {
-   wapi_ret_L( TabCtrl_GetUnicodeFormat( wapi_par_HWND( 1 ) ) ) ;
-}
+#if ! defined(HB_OS_WIN_CE)
+   wapi_ret_L( TabCtrl_GetUnicodeFormat( wapi_par_HWND( 1 ) ) );
+#else
+   wapi_ret_L( FALSE );
 #endif
+}
+
+#endif
+
 /*----------------------------------------------------------------------*/
-/*----------------------------------------------------------------------*/
-// not an API
+/* not an API */
 
 HB_FUNC( WAPI_TABCTRL_CREATE )
 {
@@ -762,16 +778,16 @@ HB_FUNC( WAPI_TABCTRL_CREATE )
    HWND hbutton;
    LONG hFont;
    LONG style;
-   style   = ISNIL(6) ? 0 : (LONG) hb_parnl(6);
-   hwnd    = (HWND) hb_parnl (1);
-   hFont   = SendMessage( hwnd, WM_GETFONT, 0, 0);
-   hbutton = CreateWindowEx(0, WC_TABCONTROL, NULL , style, hb_parni(2), hb_parni(3) , hb_parni(4), hb_parni(5) , hwnd,NULL, GetModuleHandle(NULL) , NULL ) ;
-   SendMessage(hbutton,(UINT)WM_SETFONT, (WPARAM) hFont, 1 ) ;
-   hb_retnl ( (LONG) hbutton );
+   style   = ISNIL( 6 ) ? 0 : ( LONG ) hb_parnl( 6 );
+   hwnd    = ( HWND ) hb_parnl( 1 );
+   hFont   = SendMessage( hwnd, WM_GETFONT, 0, 0 );
+   hbutton = CreateWindowEx( 0, WC_TABCONTROL, NULL, style, hb_parni( 2 ), hb_parni( 3 ) , hb_parni( 4 ), hb_parni( 5 ), hwnd, NULL, GetModuleHandle( NULL ), NULL );
+   SendMessage( hbutton, ( UINT ) WM_SETFONT, ( WPARAM ) hFont, 1 );
+   hb_retnl( ( LONG ) hbutton );
 }
 
 /*----------------------------------------------------------------------*/
-// not an API
+/* not an API */
 
 HB_FUNC( WAPI_TABCTRL_ADDITEM )
 {
@@ -787,4 +803,3 @@ HB_FUNC( WAPI_TABCTRL_ADDITEM )
    HB_TCHAR_FREE( szText );
 }
 /*----------------------------------------------------------------------*/
-

harbour/contrib/hbwin/wapi_winuser.c

@@ -62,9 +62,13 @@ BOOL EnableScrollBar( HWND hWnd, UINT wSBflags, UINT wArrows );
 */
 HB_FUNC( WAPI_ENABLESCROLLBAR )
 {
+#if ! defined(HB_OS_WIN_CE)
    wapi_ret_L( EnableScrollBar( wapi_par_HWND( 1 ),
                                 wapi_par_UINT( 2 ),
                                 wapi_par_UINT( 3 ) ) );
+#else
+   wapi_ret_L( FALSE );
+#endif
 }
 /*----------------------------------------------------------------------*/
 /*
@@ -106,19 +110,14 @@ BOOL GetScrollInfo( HWND hwnd, int fnBar, LPSCROLLINFO lpsi );
 HB_FUNC( WAPI_GETSCROLLINFO )
 {
    LPSCROLLINFO si = ( LPSCROLLINFO ) wapi_par_STRUCT( 3 );
-   //LPSCROLLINFO si;
    BOOL         bSuccess;
 
-   //memset( si, 0, sizeof( SCROLLINFO ) );
-   //si->cbSize = sizeof( SCROLLINFO );
-
    bSuccess = GetScrollInfo( wapi_par_HWND( 1 ),
                              wapi_par_INT( 2 ),
                              si );
    if( bSuccess )
-   {
       hb_storclen( ( char* ) &si, 3, sizeof( SCROLLINFO ) );
-   }
+
    wapi_ret_L( bSuccess );
 }
 /*----------------------------------------------------------------------*/
@@ -127,8 +126,12 @@ int GetScrollPos( HWND hWnd, int nBar );
 */
 HB_FUNC( WAPI_GETSCROLLPOS )
 {
+#if ! defined(HB_OS_WIN_CE)
    wapi_ret_NI( GetScrollPos( wapi_par_HWND( 1 ),
                               wapi_par_INT( 2 ) ) );
+#else
+   wapi_ret_NI( 0 );
+#endif
 }
 /*----------------------------------------------------------------------*/
 /*
@@ -136,18 +139,24 @@ BOOL GetScrollRange( HWND hWnd, int nBar, LPINT lpMinPos, LPINT lpMaxPos );
 */
 HB_FUNC( WAPI_GETSCROLLRANGE )
 {
-   int minPos, maxPos;
-
-   if( GetScrollRange( wapi_par_HWND( 1 ),
-                       wapi_par_INT( 2 ),
-                       &minPos,
-                       &maxPos ) )
+#if ! defined(HB_OS_WIN_CE)
    {
-      hb_storni( minPos, 3 );
-      hb_storni( maxPos, 4 );
+      int minPos, maxPos;
 
-      wapi_ret_L( TRUE );
+      if( GetScrollRange( wapi_par_HWND( 1 ),
+                          wapi_par_INT( 2 ),
+                          &minPos,
+                          &maxPos ) )
+      {
+         hb_storni( minPos, 3 );
+         hb_storni( maxPos, 4 );
+
+         wapi_ret_L( TRUE );
+         return;
+      }
    }
+#endif
+
    wapi_ret_L( FALSE );
 }
 /*----------------------------------------------------------------------*/
@@ -221,9 +230,13 @@ BOOL ShowScrollBar( HWND hWnd, int wBar, BOOL bShow );
 */
 HB_FUNC( WAPI_SHOWSCROLLBAR )
 {
+#if ! defined(HB_OS_WIN_CE)
    wapi_ret_L( ShowScrollBar( wapi_par_HWND( 1 ),
                               wapi_par_INT( 2 ),
                               wapi_par_BOOL( 3 ) ) );
+#else
+   wapi_ret_L( FALSE );
+#endif
 }
 /*----------------------------------------------------------------------*/
 /*                                                                      */
@@ -244,29 +257,21 @@ HB_FUNC( WAPI_LOADBITMAP )
    HBITMAP hbmp;
 
    if( ISNUM( 2 ) )
-   {
       lpBmp = ( LPTSTR ) MAKEINTRESOURCE( wapi_par_INT( 2 ) );
-   }
    else
-   {
       lpBmp = ( LPTSTR ) HB_TCHAR_CONVTO( hb_parc( 2 ) );
-   }
 
    hbmp = LoadBitmap( hinst, lpBmp );
    if( hbmp )
    {
 hb_ToOutDebug( "hbmp loaded" );
-      wapi_ret_NINT( (long) hbmp );
+      wapi_ret_NINT( ( long ) hbmp );
    }
    else
       wapi_ret_NI( 0 );
-   //wapi_ret_NINT( ( long ) LoadBitmap( GetModuleHandle( 0 ), lpBmp ) );
 
-   if( !ISNUM( 2 ) )
-   {
+   if( ! ISNUM( 2 ) )
       HB_TCHAR_FREE( lpBmp );
-   }
 }
 #endif
 /*----------------------------------------------------------------------*/
-