diff --git a/harbour/ChangeLog b/harbour/ChangeLog index eb5bfdfb21..b573bb9ece 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,10 @@ The license applies to all entries newer than 2009-04-28. */ +2010-09-18 10:12 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * src/rtl/ttopbar.prg + ! Reverted: 2010-09-17 15:49 UTC-0800 + 2010-09-17 19:37 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtgui/qth/QPainter.qth ! Prepared: drawText() for single call protocol as :hbDrawText(). @@ -31,19 +35,19 @@ * contrib/hbqt/utils/hbqtgen.prg + Implemented: "..." parameter as method argument. - Needed to streamline in single call of Qt's + Needed to streamline in single call of Qt's overloaded by argument type methods. * contrib/hbide/hbqreportsmanager.prg ! Demonstrated the use of QPainter():drawLine( ... ) with variable type of argument types. - NOTE: this mechanism holds good if arguments are + NOTE: this mechanism holds good if arguments are constructed via Q*Class( ... ) call only. - Also this mechanism seems to be working best + Also this mechanism seems to be working best for only those classes of Qt which are neither - inherited nor inheriting other class. The - classes in this bracket are like - QBrush, + inherited nor inheriting other class. The + classes in this bracket are like - QBrush, QColor, QPixmap, QRect, QPoint, etc. 2010-09-17 15:49 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) @@ -68,8 +72,8 @@ * contrib/hbqt/qtgui/qth/QIcon.qth ! An important change in constructor. - TO-REMEMBER: whenever any parameter has to be tested with - HB_ISCHAR() and HB_ISPOINTER(), HB_ISCHAR() must ever be + TO-REMEMBER: whenever any parameter has to be tested with + HB_ISCHAR() and HB_ISPOINTER(), HB_ISCHAR() must ever be checked first then HB_ISPOINTER(), at least for hbQT. * contrib/hbqt/utils/hbqtgen.prg @@ -78,7 +82,7 @@ * contrib/hbqt/qt*/g/*.prg * contrib/hbqt/qt*/doc/en/*.txt * Auto generated. - + 2010-09-17 07:59 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/contrib/hbwin/win_rpc.c * casting to pacify MinGW warnings @@ -97,7 +101,7 @@ * contrib/hbqt/qtcore/hbqt_misc.prg ! Changed the way hbqt_ptr( oQtOROtherObject ) was returning :pPtr. - Now it checks <:pPtr> instance variable's presence if it + Now it checks <:pPtr> instance variable's presence if it is a member of the class or not. WARNING: Now onwards any class derived from hbQT class must contain @@ -161,13 +165,13 @@ * contrib/hbqt/qtgui/qth/QGraphicsTextItem.qth * contrib/hbqt/qtgui/qth/QWidget.qth * contrib/hbqt/qtwebkit/g/hbqtwebkit.h - ! Corrected constructors which were wrongly based + ! Corrected constructors which were wrongly based on p->HBQT_TYPE_Q*Class for certain situations. - CAUTION: HBQT_TYPE_Q*Class member of hbQT structure + CAUTION: HBQT_TYPE_Q*Class member of hbQT structure is only usable for objects which neither _INHERIT_ nor - _INHERITED_ by any other class. Also it may pose - problems if direct pointer obtained from some + _INHERITED_ by any other class. Also it may pose + problems if direct pointer obtained from some method call is supplied to the constructor. - contrib/hbqt/qtgui/hbqt_hbqgraphicsrectitem.cpp @@ -176,14 +180,14 @@ 2010-09-15 23:25 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/global.mk - + Pointing to INSTALL doc in missing HB_INSTALL_PREFIX error + + Pointing to INSTALL doc in missing HB_INSTALL_PREFIX error message. 2010-09-15 23:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbwin/hbwin.hbp + contrib/hbwin/win_rpc.c + contrib/hbwin/tests/testrpc.prg - + Added WIN_UUIDCREATESTRING() function to generate UUIDs + + Added WIN_UUIDCREATESTRING() function to generate UUIDs via Windows API. Requires W2K or upper as per MSDN. If not supported, it returns empty string. diff --git a/harbour/src/rtl/ttopbar.prg b/harbour/src/rtl/ttopbar.prg index 64416c0fb7..13b07c269c 100644 --- a/harbour/src/rtl/ttopbar.prg +++ b/harbour/src/rtl/ttopbar.prg @@ -66,7 +66,7 @@ CREATE CLASS TOPBARMENU FUNCTION HBTopBarMenu EXPORTED: - METHOD cargo( xCargo ) SETGET + VAR cargo METHOD addItem( oItem ) METHOD delItem( nPos ) @@ -103,8 +103,7 @@ CREATE CLASS TOPBARMENU FUNCTION HBTopBarMenu VAR aItems INIT {} VAR nWidth INIT 0 - - VAR xCargo + ENDCLASS METHOD addItem( oItem ) CLASS TOPBARMENU @@ -467,16 +466,6 @@ METHOD New( nRow, nLeft, nRight ) CLASS TOPBARMENU /* -------------------------------------------- */ -METHOD cargo( xCargo ) CLASS TOPBARMENU - - IF xCargo != NIL - ::xCargo := xCargo - ENDIF - - RETURN ::xCargo - -/* -------------------------------------------- */ - FUNCTION TopBar( nRow, nLeft, nRight ) RETURN HBTopBarMenu():New( nRow, nLeft, nRight )