From 33781293affdc9cb21d3b075944142192ec161c8 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 5 Feb 2011 17:29:58 +0000 Subject: [PATCH] 2011-02-05 18:29 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * examples/gtwvw/wvwfuncs.c * Renamed WIN_RECTANGLE() to WVW_RECTANGLE() * Renamed WIN_SETBKMODE() to WVW_SETBKMODE() - Deleted WIN_LOWORD() - Deleted WIN_HIWORD() ; INCOMPATIBILITY: If you used WIN_RECTANGLE() or WIN_SETBKMODE() specifically from GTWVW, change these calls to the neww WVW_*() versions. If you used WIN_LOWORD() or WIN_HIWORD(), link hbwin lib (hbwin.hbc) to your app. * contrib/*/*.hbx * Regenerated. --- harbour/ChangeLog | 15 +++++++++++++++ harbour/contrib/hbexpat/hbexpat.hbx | 3 +-- harbour/contrib/hblzf/hblzf.hbx | 3 +-- harbour/contrib/hbmxml/hbmxml.hbx | 6 ++++-- harbour/contrib/hbmzip/hbmzip.hbx | 3 +-- harbour/contrib/hbxdiff/hbxdiff.hbx | 3 +-- harbour/examples/gtwvw/wvwfuncs.c | 20 +++----------------- 7 files changed, 26 insertions(+), 27 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7dc41d9a46..749c8504b9 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,21 @@ The license applies to all entries newer than 2009-04-28. */ +2011-02-05 18:29 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * examples/gtwvw/wvwfuncs.c + * Renamed WIN_RECTANGLE() to WVW_RECTANGLE() + * Renamed WIN_SETBKMODE() to WVW_SETBKMODE() + - Deleted WIN_LOWORD() + - Deleted WIN_HIWORD() + ; INCOMPATIBILITY: If you used WIN_RECTANGLE() or WIN_SETBKMODE() + specifically from GTWVW, change these calls to + the neww WVW_*() versions. + If you used WIN_LOWORD() or WIN_HIWORD(), + link hbwin lib (hbwin.hbc) to your app. + + * contrib/*/*.hbx + * Regenerated. + 2011-02-05 17:51 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbssl/ssl.c ! Suppressed msvc warning. diff --git a/harbour/contrib/hbexpat/hbexpat.hbx b/harbour/contrib/hbexpat/hbexpat.hbx index 65e30d7d2f..d3cd478de8 100644 --- a/harbour/contrib/hbexpat/hbexpat.hbx +++ b/harbour/contrib/hbexpat/hbexpat.hbx @@ -11,8 +11,7 @@ /* -------------------------------------------------------------------- */ /* WARNING: Automatically generated code below. DO NOT EDIT! */ -/* Regenerate with HB_REBUILD_EXTERN=yes while using GCC */ -/* compiler family. [vszakats] */ +/* Regenerate using hbmk2 '-hbx=' option. */ /* -------------------------------------------------------------------- */ #ifndef __HBEXTERN_CH__HBEXPAT__ diff --git a/harbour/contrib/hblzf/hblzf.hbx b/harbour/contrib/hblzf/hblzf.hbx index 4567dbad9d..ab3091ab7e 100644 --- a/harbour/contrib/hblzf/hblzf.hbx +++ b/harbour/contrib/hblzf/hblzf.hbx @@ -11,8 +11,7 @@ /* -------------------------------------------------------------------- */ /* WARNING: Automatically generated code below. DO NOT EDIT! */ -/* Regenerate with HB_REBUILD_EXTERN=yes while using GCC */ -/* compiler family. [vszakats] */ +/* Regenerate using hbmk2 '-hbx=' option. */ /* -------------------------------------------------------------------- */ #ifndef __HBEXTERN_CH__HBLZF__ diff --git a/harbour/contrib/hbmxml/hbmxml.hbx b/harbour/contrib/hbmxml/hbmxml.hbx index 0db10f08ce..1d960b5e13 100644 --- a/harbour/contrib/hbmxml/hbmxml.hbx +++ b/harbour/contrib/hbmxml/hbmxml.hbx @@ -11,8 +11,7 @@ /* -------------------------------------------------------------------- */ /* WARNING: Automatically generated code below. DO NOT EDIT! */ -/* Regenerate with HB_REBUILD_EXTERN=yes while using GCC */ -/* compiler family. [vszakats] */ +/* Regenerate using hbmk2 '-hbx=' option. */ /* -------------------------------------------------------------------- */ #ifndef __HBEXTERN_CH__HBMXML__ @@ -36,6 +35,7 @@ DYNAMIC MXMLELEMENTDELETEATTR DYNAMIC MXMLELEMENTGETATTR DYNAMIC MXMLELEMENTSETATTR DYNAMIC MXMLELEMENTSETATTRF +DYNAMIC MXMLELEMENTSETATTRF DYNAMIC MXMLENTITYGETNAME DYNAMIC MXMLENTITYGETVALUE DYNAMIC MXMLFINDELEMENT @@ -71,6 +71,7 @@ DYNAMIC MXMLNEWOPAQUE DYNAMIC MXMLNEWREAL DYNAMIC MXMLNEWTEXT DYNAMIC MXMLNEWTEXTF +DYNAMIC MXMLNEWTEXTF DYNAMIC MXMLNEWXML DYNAMIC MXMLREMOVE DYNAMIC MXMLSAVEALLOCSTRING @@ -88,6 +89,7 @@ DYNAMIC MXMLSETOPAQUE DYNAMIC MXMLSETREAL DYNAMIC MXMLSETTEXT DYNAMIC MXMLSETTEXTF +DYNAMIC MXMLSETTEXTF DYNAMIC MXMLSETUSERDATA DYNAMIC MXMLSETWRAPMARGIN DYNAMIC MXMLWALKNEXT diff --git a/harbour/contrib/hbmzip/hbmzip.hbx b/harbour/contrib/hbmzip/hbmzip.hbx index b1f17801b7..e39972ea52 100644 --- a/harbour/contrib/hbmzip/hbmzip.hbx +++ b/harbour/contrib/hbmzip/hbmzip.hbx @@ -11,8 +11,7 @@ /* -------------------------------------------------------------------- */ /* WARNING: Automatically generated code below. DO NOT EDIT! */ -/* Regenerate with HB_REBUILD_EXTERN=yes while using GCC */ -/* compiler family. [vszakats] */ +/* Regenerate using hbmk2 '-hbx=' option. */ /* -------------------------------------------------------------------- */ #ifndef __HBEXTERN_CH__HBMZIP__ diff --git a/harbour/contrib/hbxdiff/hbxdiff.hbx b/harbour/contrib/hbxdiff/hbxdiff.hbx index c345aa295f..ddd425d0c0 100644 --- a/harbour/contrib/hbxdiff/hbxdiff.hbx +++ b/harbour/contrib/hbxdiff/hbxdiff.hbx @@ -11,8 +11,7 @@ /* -------------------------------------------------------------------- */ /* WARNING: Automatically generated code below. DO NOT EDIT! */ -/* Regenerate with HB_REBUILD_EXTERN=yes while using GCC */ -/* compiler family. [vszakats] */ +/* Regenerate using hbmk2 '-hbx=' option. */ /* -------------------------------------------------------------------- */ #ifndef __HBEXTERN_CH__HBXDIFF__ diff --git a/harbour/examples/gtwvw/wvwfuncs.c b/harbour/examples/gtwvw/wvwfuncs.c index c983a6fd38..98b60d1739 100644 --- a/harbour/examples/gtwvw/wvwfuncs.c +++ b/harbour/examples/gtwvw/wvwfuncs.c @@ -1,5 +1,5 @@ /* -* $Id$ + * $Id$ */ /* @@ -183,7 +183,7 @@ HB_FUNC( WIN_SETBKCOLOR ) /*-------------------------------------------------------------------*/ -HB_FUNC( WIN_SETBKMODE ) +HB_FUNC( WVW_SETBKMODE ) { hb_retni( ( int ) SetBkMode( ( HDC ) HB_PARHANDLE( 1 ), hb_parni( 2 ) ) ); } @@ -211,20 +211,6 @@ HB_FUNC( WIN_SELECTOBJECT ) /*-------------------------------------------------------------------*/ -HB_FUNC( WIN_LOWORD ) -{ - hb_retnl( LOWORD( hb_parnl( 1 ) ) ); -} - -/*-------------------------------------------------------------------*/ - -HB_FUNC( WIN_HIWORD ) -{ - hb_retnl( HIWORD( hb_parnl( 1 ) ) ); -} - -/*-------------------------------------------------------------------*/ - HB_FUNC( WIN_MULDIV ) { hb_retni( MulDiv( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ) ) ); @@ -415,7 +401,7 @@ HB_FUNC( WIN_RELEASEDC ) /*-------------------------------------------------------------------*/ -HB_FUNC( WIN_RECTANGLE ) +HB_FUNC( WVW_RECTANGLE ) { Rectangle( ( HDC ) HB_PARHANDLE( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); }