diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 101db5f095..9307c53676 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,17 @@ The license applies to all entries newer than 2009-04-28. */ +2011-02-18 13:28 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbrun/hbrun.prg + * Setting app icon. + + * contrib/hbqt/hbmk2_qt.hbs + * contrib/hbqt/qtgui/hbqtgui.h + * contrib/hbqt/qtcore/hbqt_pointer.cpp + * contrib/hbqt/qtcore/hbqt.h + * contrib/hbqt/qtcore/hbqtcore.h + ! Fixed to use HB_U32 for object type (instead of a mixture of int and unsigned int) + 2011-02-17 15:01 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbrun/hbrun.prg + Added GTWVT on win builds. diff --git a/harbour/contrib/hbqt/hbmk2_qt.hbs b/harbour/contrib/hbqt/hbmk2_qt.hbs index 1caa145ab4..25516eb086 100644 --- a/harbour/contrib/hbqt/hbmk2_qt.hbs +++ b/harbour/contrib/hbqt/hbmk2_qt.hbs @@ -1361,7 +1361,7 @@ METHOD HbQtSource:build() NEXT aadd( aLine, "" ) FOR EACH s IN ::hRef - aadd( aLine, PadR( "#define HBQT_TYPE_" + s:__enumKey(), 64 ) + "( ( unsigned int ) 0x" + hb_NumToHex( hb_crc32( "HBQT_TYPE_" + hb_asciiUpper( ::cQtModule ) + s:__enumKey() ), 8 ) + " )" ) + aadd( aLine, PadR( "#define HBQT_TYPE_" + s:__enumKey(), 64 ) + "( ( HB_U32 ) 0x" + hb_NumToHex( hb_crc32( "HBQT_TYPE_" + hb_asciiUpper( ::cQtModule ) + s:__enumKey() ), 8 ) + " )" ) NEXT aadd( aLine, "" ) /*----------------------------------------------------------------------*/ @@ -1384,11 +1384,11 @@ METHOD HbQtSource:build() aadd( aLine, " " + ::cQtObject + " * ph;" ) ENDIF ENDIF - aadd( aLine, " bool bNew;" ) - aadd( aLine, " PHBQT_GC_FUNC func;" ) - aadd( aLine, " int type;" ) + aadd( aLine, " bool bNew;" ) + aadd( aLine, " PHBQT_GC_FUNC func;" ) + aadd( aLine, " HB_U32 type;" ) aadd( aLine, "} HBQT_GC_T_" + ::cQtObject + ";" ) - aadd( aLine, " " ) + aadd( aLine, " " ) aadd( aLine, "HBQT_GC_FUNC( hbqt_gcRelease_" + ::cQtObject + " )" ) aadd( aLine, "{" ) diff --git a/harbour/contrib/hbqt/qtcore/hbqt.h b/harbour/contrib/hbqt/qtcore/hbqt.h index 3b7aa08eb3..deecaca793 100644 --- a/harbour/contrib/hbqt/qtcore/hbqt.h +++ b/harbour/contrib/hbqt/qtcore/hbqt.h @@ -80,7 +80,7 @@ typedef struct void * ph; bool bNew; PHBQT_GC_FUNC func; - unsigned int type; + HB_U32 type; } HBQT_GC_T; typedef void ( * PHBQT_SLOT_FUNC )( PHB_ITEM * codeblock, void ** arguments ); @@ -93,7 +93,7 @@ extern HB_EXPORT void * hbqt_gcpointer( int iParam ); extern HB_EXPORT void * hbqt_detachgcpointer( int iParam ); extern HB_EXPORT const HB_GC_FUNCS * hbqt_gcFuncs( void ); extern HB_EXPORT void * hbqt_pPtrFromObj( int iParam ); -extern HB_EXPORT int hbqt_IsObjectType( int iParam, unsigned int iType ); +extern HB_EXPORT int hbqt_IsObjectType( int iParam, HB_U32 iType ); extern HB_EXPORT void hbqt_errRT_ARG( void ); HB_EXTERN_END diff --git a/harbour/contrib/hbqt/qtcore/hbqt_pointer.cpp b/harbour/contrib/hbqt/qtcore/hbqt_pointer.cpp index b42bfd175a..d2e5887051 100644 --- a/harbour/contrib/hbqt/qtcore/hbqt_pointer.cpp +++ b/harbour/contrib/hbqt/qtcore/hbqt_pointer.cpp @@ -186,7 +186,7 @@ void * hbqt_pPtrFromObj( int iParam ) } } -int hbqt_IsObjectType( int iParam, unsigned int iType ) +int hbqt_IsObjectType( int iParam, HB_U32 iType ) { PHB_ITEM pItem; diff --git a/harbour/contrib/hbqt/qtcore/hbqtcore.h b/harbour/contrib/hbqt/qtcore/hbqtcore.h index 9008e209fe..5cf15b8fe7 100644 --- a/harbour/contrib/hbqt/qtcore/hbqtcore.h +++ b/harbour/contrib/hbqt/qtcore/hbqtcore.h @@ -23,6 +23,6 @@ HB_EXTERN_END #define hbqt_par_HBQSlots( n ) ( ( HBQSlots * ) hbqt_gcpointer( n ) ) #define hbqt_par_HBQString( n ) ( ( HBQString * ) hbqt_gcpointer( n ) ) -#define HBQT_TYPE_QSize ( ( unsigned int ) 0x5E28750F ) +#define HBQT_TYPE_QSize ( ( HB_U32 ) 0x5E28750F ) #endif /* __HBQTCORE_H */ diff --git a/harbour/contrib/hbqt/qtgui/hbqtgui.h b/harbour/contrib/hbqt/qtgui/hbqtgui.h index 592f5cdab1..c1021c4317 100644 --- a/harbour/contrib/hbqt/qtgui/hbqtgui.h +++ b/harbour/contrib/hbqt/qtgui/hbqtgui.h @@ -29,16 +29,16 @@ HB_EXTERN_END #define hbqt_par_QPrinter( n ) ( ( QPrinter * ) hbqt_gcpointer( n ) ) #define hbqt_par_QWidget( n ) ( ( QWidget * ) hbqt_gcpointer( n ) ) -#define HBQT_TYPE_QBitmap ( ( unsigned int ) 0x210679C1 ) -#define HBQT_TYPE_QBoxLayout ( ( unsigned int ) 0x8E2E0CAF ) -#define HBQT_TYPE_QBrush ( ( unsigned int ) 0x96A039B0 ) -#define HBQT_TYPE_QColor ( ( unsigned int ) 0x0151A39A ) -#define HBQT_TYPE_QFont ( ( unsigned int ) 0x0A35B749 ) +#define HBQT_TYPE_QBitmap ( ( HB_U32 ) 0x210679C1 ) +#define HBQT_TYPE_QBoxLayout ( ( HB_U32 ) 0x8E2E0CAF ) +#define HBQT_TYPE_QBrush ( ( HB_U32 ) 0x96A039B0 ) +#define HBQT_TYPE_QColor ( ( HB_U32 ) 0x0151A39A ) +#define HBQT_TYPE_QFont ( ( HB_U32 ) 0x0A35B749 ) #ifndef HBQT_TYPE_QIcon -#define HBQT_TYPE_QIcon ( ( unsigned int ) 0xBF359640 ) +#define HBQT_TYPE_QIcon ( ( HB_U32 ) 0xBF359640 ) #endif #ifndef HBQT_TYPE_QPixmap -#define HBQT_TYPE_QPixmap ( ( unsigned int ) 0x25CE65E9 ) +#define HBQT_TYPE_QPixmap ( ( HB_U32 ) 0x25CE65E9 ) #endif #endif /* __HBQTGUI_H */ diff --git a/harbour/contrib/hbrun/hbrun.prg b/harbour/contrib/hbrun/hbrun.prg index 48752105c1..472c360930 100644 --- a/harbour/contrib/hbrun/hbrun.prg +++ b/harbour/contrib/hbrun/hbrun.prg @@ -342,6 +342,8 @@ STATIC PROCEDURE hbrun_Prompt( aParams, cCommand ) RETURN ENDIF + hb_GTInfo( HB_GTI_ICONRES, 1 ) + CLEAR SCREEN SET SCOREBOARD OFF GetList := {}