From 678e4d7e3ec7adf024e730b68629f192f6493c89 Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Sat, 16 Apr 2011 16:33:32 +0000 Subject: [PATCH] 2011-04-16 09:30 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbxbp/xbpfontdialog.prg ! Minor. * contrib/hbxbp/xbpwindow.prg ! Protected: :setStyleSheet() method. It was not Xbase++ compatible so to achieve exactly Xbase++ compatibility, this is necessary. --- harbour/ChangeLog | 9 +++++++++ harbour/contrib/hbxbp/xbpfontdialog.prg | 2 +- harbour/contrib/hbxbp/xbpwindow.prg | 6 ++++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index e2ac180ce9..70d4686e93 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,15 @@ The license applies to all entries newer than 2009-04-28. */ +2011-04-16 09:30 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbxbp/xbpfontdialog.prg + ! Minor. + + * contrib/hbxbp/xbpwindow.prg + ! Protected: :setStyleSheet() method. + It was not Xbase++ compatible so to achieve exactly Xbase++ + compatibility, this is necessary. + 2011-04-16 16:53 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + contrib/hbqt/tests/testres.hbp + Added project file for testres. diff --git a/harbour/contrib/hbxbp/xbpfontdialog.prg b/harbour/contrib/hbxbp/xbpfontdialog.prg index 5b9a2943eb..f5ce895c4f 100644 --- a/harbour/contrib/hbxbp/xbpfontdialog.prg +++ b/harbour/contrib/hbxbp/xbpfontdialog.prg @@ -332,7 +332,7 @@ METHOD XbpFontDialog:XbpFontObject() oXbp:nominalPointSize := ::oFont:pointSize() oXbp:weightClass := ::oFont:weight() - oXbp:setCompoundName( hb_ntos( oXbp:nominalPointSize ) + "." + oXbp:familyName ) + oXbp:setCompoundName( trim( hb_ntos( oXbp:nominalPointSize ) + "." + oXbp:familyName + " " + iif( oXbp:bold, "bold", "" ) + iif( oXbp:italic, "italic", "" ) ) ) oXbp:create() diff --git a/harbour/contrib/hbxbp/xbpwindow.prg b/harbour/contrib/hbxbp/xbpwindow.prg index ecc399f987..e71445ca6e 100644 --- a/harbour/contrib/hbxbp/xbpwindow.prg +++ b/harbour/contrib/hbxbp/xbpwindow.prg @@ -189,8 +189,6 @@ CLASS XbpWindow INHERIT XbpPartHandler METHOD isDerivedFrom( cClassORoObject ) METHOD setPresParam( aPPNew ) METHOD setCSSAttribute( cAttr, cCSS ) - METHOD setStyleSheet( cAttr, cCSS ) - METHOD getCSS( nAttr, xValue ) DATA cTitle INIT "" METHOD title( cTitle ) SETGET @@ -270,6 +268,10 @@ CLASS XbpWindow INHERIT XbpPartHandler ACCESS pParent INLINE iif( empty( ::oParent ), NIL, ::oParent:oWidget ) + PROTECTED: + METHOD setStyleSheet( cAttr, cCSS ) + METHOD getCSS( nAttr, xValue ) + ENDCLASS /*----------------------------------------------------------------------*/