diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 63ba5a4c7c..bbc7cb8bf8 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,16 @@ The license applies to all entries newer than 2009-04-28. */ +2010-08-08 16:49 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + + contrib/rddads/adsextrn.prg + * contrib/rddads/rddads.hbp + * contrib/rddads/rddads.hbx + * contrib/rddads/ads1.c + * contrib/rddads/rddads.hbc + * contrib/rddads/tests/datad.prg + * contrib/rddads/tests/testmg.prg + + Made possible to load rddads rdd dynamically. + 2010-08-07 16:18 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/hbide.qrc ! Fixed: last minute inculsion - hbide3.png. @@ -51,37 +61,37 @@ ! Reworked: many artifacts. * contrib/hbide/idebrowse.prg - + Implemented: Edits MDI area icons equivilent functionality - in ideDBU panels also. Now you can view browsers in + + Implemented: Edits MDI area icons equivilent functionality + in ideDBU panels also. Now you can view browsers in organized, cascaded, tiled, maximized, vertically tiled, - horizontally tiled, mode. Verically|Horizontally tiled + horizontally tiled, mode. Verically|Horizontally tiled modes can be zoomed to fit the user requirements. - However the last close mode is not retained. Next run + However the last close mode is not retained. Next run always open the "Main" panel with "Organized" view. + Assigned: color-differentiated icons to every open browser - window. Now the view is more attractive and allows one to + window. Now the view is more attractive and allows one to memorize a browser by color. - + With this commit, rounds of beutification for this session ends. - Now concentrating on a really-useful implementation you will + Now concentrating on a really-useful implementation you will know by the end of next-week. 2010-08-07 15:28 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbxbp/xbp.ch - + Added: few more constants with HBP* prefix to be used + + Added: few more constants with HBP* prefix to be used for upcoming HbpMdiArea() class to manage MDI areas containing sub-windows. * contrib/hbxbp/xbpwindow.prg + Implemented: ERROR HANDLER OnError( ... ) method. - Now it is possible to call Qt object methods directly - with Xbp* objects. For example, + Now it is possible to call Qt object methods directly + with Xbp* objects. For example, oXbp:oWidget:setLayout( ... ) => oXbp:setLayout( ... ) - It is a very useful extension and empowers the developer + It is a very useful extension and empowers the developer more freedom. 2010-08-07 19:40 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) diff --git a/harbour/contrib/rddads/ads1.c b/harbour/contrib/rddads/ads1.c index de36dd1f7f..ddf7546df0 100644 --- a/harbour/contrib/rddads/ads1.c +++ b/harbour/contrib/rddads/ads1.c @@ -5250,6 +5250,11 @@ static void hb_adsRddInit( void * cargo ) } } +HB_FUNC( HB_RDDADSREGISTER ) +{ + hb_adsRddInit( NULL ); +} + HB_INIT_SYMBOLS_BEGIN( ads1__InitSymbols ) { "ADS", {HB_FS_PUBLIC|HB_FS_LOCAL}, {HB_FUNCNAME( ADS )}, NULL }, { "ADS_GETFUNCTABLE", {HB_FS_PUBLIC|HB_FS_LOCAL}, {HB_FUNCNAME( ADS_GETFUNCTABLE )}, NULL }, diff --git a/harbour/contrib/rddads/adsextrn.prg b/harbour/contrib/rddads/adsextrn.prg new file mode 100644 index 0000000000..976284ba10 --- /dev/null +++ b/harbour/contrib/rddads/adsextrn.prg @@ -0,0 +1,55 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * Windows API functions (winnetwk.h - mpr.dll) + * + * Copyright 2010 Viktor Szakats (harbour.01 syenar.hu) + * www - http://harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ + +#define __HBEXTERN__RDDADS__ANNOUNCE +#define __HBEXTERN__RDDADS__REQUEST +#include "rddads.hbx" diff --git a/harbour/contrib/rddads/rddads.hbc b/harbour/contrib/rddads/rddads.hbc index b5f59b124b..91d9a3a2d8 100644 --- a/harbour/contrib/rddads/rddads.hbc +++ b/harbour/contrib/rddads/rddads.hbc @@ -2,10 +2,16 @@ # $Id$ # +# Enable dynamic loading with: +# -env:HB_DYNLOAD_RDDADS=yes + skip={!(linux|win)} incpaths=. -libs=${hb_name}${__HB_DYN__} -{win}libs=ace32 -{linux}libs=ace +{HB_DYNLOAD_RDDADS}prgflags=-D__HBDYNLOAD__RDDADS__ +{HB_DYNLOAD_RDDADS}shared=yes + +{!HB_DYNLOAD_RDDADS}libs=${hb_name}${__HB_DYN__} +{!HB_DYNLOAD_RDDADS&win}libs=ace32 +{!HB_DYNLOAD_RDDADS&linux}libs=ace diff --git a/harbour/contrib/rddads/rddads.hbp b/harbour/contrib/rddads/rddads.hbp index e9d585fac8..a01debec1f 100644 --- a/harbour/contrib/rddads/rddads.hbp +++ b/harbour/contrib/rddads/rddads.hbp @@ -27,3 +27,4 @@ ads1.c adsfunc.c adsmgmnt.c adsx.c +adsextrn.prg diff --git a/harbour/contrib/rddads/rddads.hbx b/harbour/contrib/rddads/rddads.hbx index 83b23eab57..bc522bdd8f 100644 --- a/harbour/contrib/rddads/rddads.hbx +++ b/harbour/contrib/rddads/rddads.hbx @@ -173,6 +173,7 @@ DYNAMIC ADSVFPX_GETFUNCTABLE DYNAMIC ADSWRITEALLRECORDS DYNAMIC ADSX DYNAMIC ADSX_GETFUNCTABLE +DYNAMIC HB_RDDADSREGISTER #ifdef __HBEXTERN__RDDADS__REQUEST #uncommand DYNAMIC => EXTERNAL diff --git a/harbour/contrib/rddads/tests/datad.prg b/harbour/contrib/rddads/tests/datad.prg index a1026f2fcc..883a2115a1 100644 --- a/harbour/contrib/rddads/tests/datad.prg +++ b/harbour/contrib/rddads/tests/datad.prg @@ -10,17 +10,29 @@ #include "ads.ch" REQUEST ADS +#if defined( __HBDYNLOAD__RDDADS__ ) +# include "rddads.hbx" +#endif + FUNCTION MAIN local n local cErr, cStr local aStru := {{ "ID", "A", 1, 0}, {"Name", "C", 50, 0}, {"address", "C", 50, 0}, {"city", "C", 30, 0}, {"Age", "n", 3, 0}} local hConnection1 +#if defined( __HBDYNLOAD__RDDADS__ ) + local l := hb_libLoad( hb_libName( "rddads" ) ) + + hb_rddadsRegister() + + HB_SYMBOL_UNUSED( l ) +#endif + CLS - RddSetDefault("ADT") + RddSetDefault( "ADSADT" ) AdsSetServerType ( 7 ) - SET Filetype to ADT + SET FILETYPE TO ADT ? "Default connection is 0:", adsConnection() diff --git a/harbour/contrib/rddads/tests/testmg.prg b/harbour/contrib/rddads/tests/testmg.prg index 5896bf2640..8ce995ea2f 100644 --- a/harbour/contrib/rddads/tests/testmg.prg +++ b/harbour/contrib/rddads/tests/testmg.prg @@ -50,18 +50,29 @@ * */ - #include "ord.ch" #include "set.ch" #include "ads.ch" REQUEST ADS +#if defined( __HBDYNLOAD__RDDADS__ ) +# include "rddads.hbx" +#endif + function Main() local i local aRay +#if defined( __HBDYNLOAD__RDDADS__ ) + local l := hb_libLoad( hb_libName( "rddads" ) ) + + hb_rddadsRegister() + + HB_SYMBOL_UNUSED( l ) +#endif + rddsetdefault( "ADS" ) SET SERVER LOCAL // REMOTE