diff --git a/harbour/ChangeLog b/harbour/ChangeLog index ceca045926..ba479323f1 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,12 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-02-24 17:40 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) + * contrib/hbqt/qtgui/QWidget.cpp + * contrib/hbqt/qtgui/TQWidget.prg + * contrib/hbqt/qth/QWidget.qth + + Enabled :setSizePolicy( QSizePolicy ). + 2010-02-24 16:46 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/hbide/resources/docviewgenerator.ui diff --git a/harbour/contrib/hbqt/qtgui/QWidget.cpp b/harbour/contrib/hbqt/qtgui/QWidget.cpp index 1df66d9e40..3bffb00e76 100644 --- a/harbour/contrib/hbqt/qtgui/QWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/QWidget.cpp @@ -59,6 +59,7 @@ */ /*----------------------------------------------------------------------*/ +#include "hbapi.h" #include "../hbqt.h" /*----------------------------------------------------------------------*/ @@ -72,7 +73,7 @@ */ /* - * Constructed[ 210/229 [ 91.70% ] ] + * Constructed[ 211/229 [ 92.14% ] ] * * *** Unconvered Prototypes *** * ----------------------------- @@ -93,7 +94,6 @@ * //void render ( QPaintDevice * target, const QPoint & targetOffset = QPoint(), const QRegion & sourceRegion = QRegion(), RenderFlags renderFlags = RenderFlags( DrawWindowBackground | DrawChildren ) ) * //void render ( QPainter * painter, const QPoint & targetOffset = QPoint(), const QRegion & sourceRegion = QRegion(), RenderFlags renderFlags = RenderFlags( DrawWindowBackground | DrawChildren ) ) * // void setEditFocus ( bool enable ) - * //void setSizePolicy ( QSizePolicy ) * // void setWindowSurface ( QWindowSurface * surface ) * //WId winId () const * // QWindowSurface * windowSurface () const (preliminary) @@ -1303,9 +1303,17 @@ HB_FUNC( QT_QWIDGET_SETSIZEINCREMENT_1 ) } /* - * void setSizePolicy ( QSizePolicy::Policy horizontal, QSizePolicy::Policy vertical ) + * void setSizePolicy ( const QSizePolicy & policy ) */ HB_FUNC( QT_QWIDGET_SETSIZEPOLICY ) +{ + hbqt_par_QWidget( 1 )->setSizePolicy( *hbqt_par_QSizePolicy( 2 ) ); +} + +/* + * void setSizePolicy ( QSizePolicy::Policy horizontal, QSizePolicy::Policy vertical ) + */ +HB_FUNC( QT_QWIDGET_SETSIZEPOLICY_1 ) { hbqt_par_QWidget( 1 )->setSizePolicy( ( QSizePolicy::Policy ) hb_parni( 2 ), ( QSizePolicy::Policy ) hb_parni( 3 ) ); } diff --git a/harbour/contrib/hbqt/qtgui/TQWidget.prg b/harbour/contrib/hbqt/qtgui/TQWidget.prg index a53bd8068f..47aef93027 100644 --- a/harbour/contrib/hbqt/qtgui/TQWidget.prg +++ b/harbour/contrib/hbqt/qtgui/TQWidget.prg @@ -206,7 +206,8 @@ CREATE CLASS QWidget INHERIT HbQtObjectHandler, QObject, QPaintDevice METHOD setShortcutEnabled( nId, lEnable ) METHOD setSizeIncrement( pQSize ) METHOD setSizeIncrement_1( nW, nH ) - METHOD setSizePolicy( nHorizontal, nVertical ) + METHOD setSizePolicy( pPolicy ) + METHOD setSizePolicy_1( nHorizontal, nVertical ) METHOD setStatusTip( cQString ) METHOD setStyle( pStyle ) METHOD setToolTip( cQString ) @@ -846,8 +847,12 @@ METHOD QWidget:setSizeIncrement_1( nW, nH ) RETURN Qt_QWidget_setSizeIncrement_1( ::pPtr, nW, nH ) -METHOD QWidget:setSizePolicy( nHorizontal, nVertical ) - RETURN Qt_QWidget_setSizePolicy( ::pPtr, nHorizontal, nVertical ) +METHOD QWidget:setSizePolicy( pPolicy ) + RETURN Qt_QWidget_setSizePolicy( ::pPtr, hbqt_ptr( pPolicy ) ) + + +METHOD QWidget:setSizePolicy_1( nHorizontal, nVertical ) + RETURN Qt_QWidget_setSizePolicy_1( ::pPtr, nHorizontal, nVertical ) METHOD QWidget:setStatusTip( cQString ) diff --git a/harbour/contrib/hbqt/qth/QWidget.qth b/harbour/contrib/hbqt/qth/QWidget.qth index 2b09f75d32..baa19243b0 100644 --- a/harbour/contrib/hbqt/qth/QWidget.qth +++ b/harbour/contrib/hbqt/qth/QWidget.qth @@ -256,10 +256,7 @@ void setShortcutAutoRepeat ( int id, bool enable = true ) void setShortcutEnabled ( int id, bool enable = true ) void setSizeIncrement ( const QSize & ) void setSizeIncrement ( int w, int h ) -# -# do not know how to handle ?? -# -//void setSizePolicy ( QSizePolicy ) +void setSizePolicy ( const QSizePolicy & policy ) void setSizePolicy ( QSizePolicy::Policy horizontal, QSizePolicy::Policy vertical ) void setStatusTip ( const QString & ) void setStyle ( QStyle * style )