From 7f11ef9f1a001e5c2f5b594a11f1e7449da07480 Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Mon, 20 Sep 2010 23:34:42 +0000 Subject: [PATCH] 2010-09-20 16:34 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/idedocks.prg * contrib/hbide/idedocwriter.prg * contrib/hbide/idefindreplace.prg * contrib/hbide/ideharbourhelp.prg * contrib/hbide/ideshortcuts.prg * contrib/hbide/ideskeletons.prg ! Adjusted for many-to-one protocol. * contrib/hbxbp/xbppushbutton.prg * contrib/hbxbp/xbpwindow.prg ! Adjusted for many-to-one protocol. * contrib/hbqt/qtgui/doc/en/class_qwidget.txt * contrib/hbqt/qtgui/g/QWidget.cpp * contrib/hbqt/qtgui/g/TQWidget.prg * Re-generated. * contrib/hbqt/qtgui/qth/QWidget.qth + Implemented: many-to-one method call protocol. --- harbour/ChangeLog | 21 + harbour/contrib/hbide/idedocks.prg | 4 +- harbour/contrib/hbide/idedocwriter.prg | 2 +- harbour/contrib/hbide/idefindreplace.prg | 4 +- harbour/contrib/hbide/ideharbourhelp.prg | 6 +- harbour/contrib/hbide/ideshortcuts.prg | 2 +- harbour/contrib/hbide/ideskeletons.prg | 2 +- .../hbqt/qtgui/doc/en/class_qwidget.txt | 52 +- harbour/contrib/hbqt/qtgui/g/QWidget.cpp | 520 ++++++++---------- harbour/contrib/hbqt/qtgui/g/TQWidget.prg | 275 ++++----- harbour/contrib/hbqt/qtgui/qth/QWidget.qth | 393 +++++++++++-- harbour/contrib/hbxbp/xbppushbutton.prg | 2 +- harbour/contrib/hbxbp/xbpwindow.prg | 2 +- 13 files changed, 740 insertions(+), 545 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 59b1971410..5b7b63f4a0 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,27 @@ The license applies to all entries newer than 2009-04-28. */ +2010-09-20 16:34 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbide/idedocks.prg + * contrib/hbide/idedocwriter.prg + * contrib/hbide/idefindreplace.prg + * contrib/hbide/ideharbourhelp.prg + * contrib/hbide/ideshortcuts.prg + * contrib/hbide/ideskeletons.prg + ! Adjusted for many-to-one protocol. + + * contrib/hbxbp/xbppushbutton.prg + * contrib/hbxbp/xbpwindow.prg + ! Adjusted for many-to-one protocol. + + * contrib/hbqt/qtgui/doc/en/class_qwidget.txt + * contrib/hbqt/qtgui/g/QWidget.cpp + * contrib/hbqt/qtgui/g/TQWidget.prg + * Re-generated. + + * contrib/hbqt/qtgui/qth/QWidget.qth + + Implemented: many-to-one method call protocol. + 2010-09-20 15:07 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtgui/doc/en/class_qpainter.txt * contrib/hbqt/qtgui/doc/en/class_qpainterpath.txt diff --git a/harbour/contrib/hbide/idedocks.prg b/harbour/contrib/hbide/idedocks.prg index 1b83e8f2d1..c9fc7eefac 100644 --- a/harbour/contrib/hbide/idedocks.prg +++ b/harbour/contrib/hbide/idedocks.prg @@ -1433,7 +1433,7 @@ METHOD IdeDocks:buildProjectTree() ::oProjTree:setStyleSheet( GetStyleSheet( "QTreeWidgetHB", ::nAnimantionMode ) ) ::oProjTree:oWidget:setMinimumWidth( 100 ) - ::oProjTree:oWidget:setSizePolicy_1( QSizePolicy_MinimumExpanding, QSizePolicy_Preferred ) + ::oProjTree:oWidget:setSizePolicy( QSizePolicy_MinimumExpanding, QSizePolicy_Preferred ) ::oProjTree:oWidget:setIconSize( QSize( 12,12 ) ) ::oProjTree:oWidget:setIndentation( 12 ) @@ -1486,7 +1486,7 @@ METHOD IdeDocks:buildEditorTree() ::oEditTree:hasButtons := .T. ::oEditTree:create( ::oDockED, , { 0,0 }, { 100,10 }, , .t. ) - ::oEditTree:oWidget:setSizePolicy_1( QSizePolicy_MinimumExpanding, QSizePolicy_Preferred ) + ::oEditTree:oWidget:setSizePolicy( QSizePolicy_MinimumExpanding, QSizePolicy_Preferred ) ::oEditTree:oWidget:setMinimumWidth( 100 ) ::oEditTree:oWidget:setIconSize( QSize( 12,12 ) ) ::oEditTree:oWidget:setIndentation( 12 ) diff --git a/harbour/contrib/hbide/idedocwriter.prg b/harbour/contrib/hbide/idedocwriter.prg index a53792103f..b53f89dac1 100644 --- a/harbour/contrib/hbide/idedocwriter.prg +++ b/harbour/contrib/hbide/idedocwriter.prg @@ -295,7 +295,7 @@ METHOD IdeDocWriter:setParameters() ::oUI:q_plainExamples:setFont( ::oFont:oWidget ) ::oUI:q_plainTests:setFont( ::oFont:oWidget ) - ::oUI:q_frameGeneral:setSizePolicy_1( QSizePolicy_Preferred, QSizePolicy_Fixed ) + ::oUI:q_frameGeneral:setSizePolicy( QSizePolicy_Preferred, QSizePolicy_Fixed ) RETURN Self diff --git a/harbour/contrib/hbide/idefindreplace.prg b/harbour/contrib/hbide/idefindreplace.prg index 69bb5d8bec..ba0b725788 100644 --- a/harbour/contrib/hbide/idefindreplace.prg +++ b/harbour/contrib/hbide/idefindreplace.prg @@ -368,7 +368,7 @@ METHOD IdeSearchReplace:beginFind() ::cFind := "" ::qFindLineEdit:activateWindow() - ::qFindLineEdit:setFocus_1() + ::qFindLineEdit:setFocus() ::qFindLineEdit:selectAll() RETURN Self @@ -607,7 +607,7 @@ METHOD IdeFindReplace:onClickFind() ::oUI:q_checkGlobal:setEnabled( .f. ) ::oUI:q_checkNoPrompting:setEnabled( .f. ) ::oUI:q_buttonFind:activateWindow() - ::oUI:q_buttonFind:setFocus_1() + ::oUI:q_buttonFind:setFocus() ENDIF RETURN Self diff --git a/harbour/contrib/hbide/ideharbourhelp.prg b/harbour/contrib/hbide/ideharbourhelp.prg index e4cd5f28dc..c154afbb60 100644 --- a/harbour/contrib/hbide/ideharbourhelp.prg +++ b/harbour/contrib/hbide/ideharbourhelp.prg @@ -425,7 +425,7 @@ METHOD IdeHarbourHelp:execEvent( nMode, p, p1 ) CASE "tabWidgetContents_currentChanged" IF p == 1 - ::oUI:q_editIndex:setFocus_1() + ::oUI:q_editIndex:setFocus() ENDIF EXIT @@ -441,13 +441,13 @@ METHOD IdeHarbourHelp:execEvent( nMode, p, p1 ) CASE "listIndex_ItemDoubleClicked" ::populateIndexedSelection() - ::oUI:q_editIndex:setFocus_1() + ::oUI:q_editIndex:setFocus() EXIT CASE "editIndex_returnPressed" IF !empty( ::oUI:q_editIndex:text() ) ::populateIndexedSelection() - ::oUI:q_editIndex:setFocus_1() + ::oUI:q_editIndex:setFocus() ENDIF EXIT diff --git a/harbour/contrib/hbide/ideshortcuts.prg b/harbour/contrib/hbide/ideshortcuts.prg index 0a00e9927d..ad635b0a15 100644 --- a/harbour/contrib/hbide/ideshortcuts.prg +++ b/harbour/contrib/hbide/ideshortcuts.prg @@ -741,7 +741,7 @@ METHOD IdeShortcuts:test( cString, lWarn ) ErrorBlock( bError ) ::oUI:raise() - ::oUI:setFocus_1() + ::oUI:setFocus() RETURN lOk diff --git a/harbour/contrib/hbide/ideskeletons.prg b/harbour/contrib/hbide/ideskeletons.prg index 5ad09a9ee7..a731ac305b 100644 --- a/harbour/contrib/hbide/ideskeletons.prg +++ b/harbour/contrib/hbide/ideskeletons.prg @@ -497,7 +497,7 @@ METHOD IdeSkeletons:showTree() ::oTree:create( ::oSkltnsTreeDock, , { 0,0 }, { 10,10 }, , .t. ) ::oTree:oWidget:setMinimumWidth( 100 ) - ::oTree:oWidget:setSizePolicy_1( QSizePolicy_MinimumExpanding, QSizePolicy_Preferred ) + ::oTree:oWidget:setSizePolicy( QSizePolicy_MinimumExpanding, QSizePolicy_Preferred ) ::oTree:oWidget:setIconSize( QSize( 12,12 ) ) ::oTree:oWidget:setIndentation( 12 ) diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qwidget.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qwidget.txt index dd17edbd79..612e6fb800 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qwidget.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qwidget.txt @@ -52,8 +52,7 @@ * :geometry() -> pQRect * :getContentsMargins( @nLeft, @nTop, @nRight, @nBottom ) -> NIL * :grabKeyboard() -> NIL - * :grabMouse() -> NIL - * :grabMouse_1( pCursor ) -> NIL + * :grabMouse( ... ) -> NIL * :grabShortcut( pKey, nContext ) -> nInt * :hasFocus() -> lBool * :hasMouseTracking() -> lBool @@ -91,8 +90,7 @@ * :minimumSize() -> pQSize * :minimumSizeHint() -> pQSize * :minimumWidth() -> nInt - * :move( nX, nY ) -> NIL - * :move_1( pQPoint ) -> NIL + * :move( ... ) -> NIL * :normalGeometry() -> pQRect * :overrideWindowFlags( nFlags ) -> NIL * :paintEngine() -> pQPaintEngine @@ -103,58 +101,45 @@ * :releaseMouse() -> NIL * :releaseShortcut( nId ) -> NIL * :removeAction( pAction ) -> NIL - * :repaint( nX, nY, nW, nH ) -> NIL - * :repaint_1( pRect ) -> NIL - * :repaint_2( pRgn ) -> NIL - * :resize( nW, nH ) -> NIL - * :resize_1( pQSize ) -> NIL + * :repaint( ... ) -> NIL + * :resize( ... ) -> NIL * :restoreGeometry( pGeometry ) -> lBool * :saveGeometry() -> pQByteArray - * :scroll( nDx, nDy ) -> NIL - * :scroll_1( nDx, nDy, pR ) -> NIL + * :scroll( ... ) -> NIL * :setAcceptDrops( lOn ) -> NIL * :setAttribute( nAttribute, lOn ) -> NIL * :setAutoFillBackground( lEnabled ) -> NIL * :setBackgroundRole( nRole ) -> NIL - * :setBaseSize( pQSize ) -> NIL - * :setBaseSize_1( nBasew, nBaseh ) -> NIL + * :setBaseSize( ... ) -> NIL * :setContentsMargins( nLeft, nTop, nRight, nBottom ) -> NIL * :setContextMenuPolicy( nPolicy ) -> NIL * :setCursor( pQCursor ) -> NIL * :setFixedHeight( nH ) -> NIL - * :setFixedSize( pS ) -> NIL - * :setFixedSize_1( nW, nH ) -> NIL + * :setFixedSize( ... ) -> NIL * :setFixedWidth( nW ) -> NIL - * :setFocus( nReason ) -> NIL + * :setFocus( ... ) -> NIL * :setFocusPolicy( nPolicy ) -> NIL * :setFocusProxy( pW ) -> NIL * :setFont( pQFont ) -> NIL * :setForegroundRole( nRole ) -> NIL - * :setGeometry( pQRect ) -> NIL - * :setGeometry_1( nX, nY, nW, nH ) -> NIL + * :setGeometry( ... ) -> NIL * :setLayout( pLayout ) -> NIL * :setLayoutDirection( nDirection ) -> NIL * :setLocale( pLocale ) -> NIL - * :setMask( pBitmap ) -> NIL - * :setMask_1( pRegion ) -> NIL + * :setMask( ... ) -> NIL * :setMaximumHeight( nMaxh ) -> NIL - * :setMaximumSize( pQSize ) -> NIL - * :setMaximumSize_1( nMaxw, nMaxh ) -> NIL + * :setMaximumSize( ... ) -> NIL * :setMaximumWidth( nMaxw ) -> NIL * :setMinimumHeight( nMinh ) -> NIL - * :setMinimumSize( pQSize ) -> NIL - * :setMinimumSize_1( nMinw, nMinh ) -> NIL + * :setMinimumSize( ... ) -> NIL * :setMinimumWidth( nMinw ) -> NIL * :setMouseTracking( lEnable ) -> NIL * :setPalette( pQPalette ) -> NIL - * :setParent( pParent ) -> NIL - * :setParent_1( pParent, nF ) -> NIL + * :setParent( ... ) -> NIL * :setShortcutAutoRepeat( nId, lEnable ) -> NIL * :setShortcutEnabled( nId, lEnable ) -> NIL - * :setSizeIncrement( pQSize ) -> NIL - * :setSizeIncrement_1( nW, nH ) -> NIL - * :setSizePolicy( pPolicy ) -> NIL - * :setSizePolicy_1( nHorizontal, nVertical ) -> NIL + * :setSizeIncrement( ... ) -> NIL + * :setSizePolicy( ... ) -> NIL * :setStatusTip( cQString ) -> NIL * :setStyle( pStyle ) -> NIL * :setToolTip( cQString ) -> NIL @@ -182,9 +167,7 @@ * :unsetCursor() -> NIL * :unsetLayoutDirection() -> NIL * :unsetLocale() -> NIL - * :update( nX, nY, nW, nH ) -> NIL - * :update_1( pRect ) -> NIL - * :update_2( pRgn ) -> NIL + * :update( ... ) -> NIL * :updateGeometry() -> NIL * :updatesEnabled() -> lBool * :visibleRegion() -> pQRegion @@ -207,10 +190,8 @@ * :hide() -> NIL * :lower() -> NIL * :raise() -> NIL - * :repaint_3() -> NIL * :setDisabled( lDisable ) -> NIL * :setEnabled( lEnable ) -> NIL - * :setFocus_1() -> NIL * :setHidden( lHidden ) -> NIL * :setStyleSheet( cStyleSheet ) -> NIL * :setVisible( lVisible ) -> NIL @@ -221,7 +202,6 @@ * :showMaximized() -> NIL * :showMinimized() -> NIL * :showNormal() -> NIL - * :update_3() -> NIL * * $DESCRIPTION$ * diff --git a/harbour/contrib/hbqt/qtgui/g/QWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QWidget.cpp index 4635708238..59a9379c64 100644 --- a/harbour/contrib/hbqt/qtgui/g/QWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QWidget.cpp @@ -73,38 +73,93 @@ */ /* - * Constructed[ 206/230 [ 89.57% ] ] + * Constructed[ 185/264 [ 70.08% ] ] * * *** Unconvered Prototypes *** * ----------------------------- * * } * void addActions ( QList actions ) + * } + * } * void insertActions ( QAction * before, QList actions ) + * } + * } + * } + * } + * } + * } + * } + * } + * } + * } + * } + * } + * } + * } + * } * * *** Commented out protos which construct fine but do not compile *** * * // QString accessibleDescription () const * // QString accessibleName () const + * //QWidget * childAt ( int x, int y ) const + * //QWidget * childAt ( const QPoint & p ) const * // WId effectiveWinId () const * // virtual HDC getDC () const + * //void grabMouse () + * //void grabMouse ( const QCursor & cursor ) * // QGraphicsProxyWidget * graphicsProxyWidget () const * // bool hasEditFocus () const * // QInputContext * inputContext () * // Qt::HANDLE macCGHandle () const * // Qt::HANDLE macQDHandle () const + * //void move ( int x, int y ) + * //void move ( const QPoint & ) * // virtual void releaseDC ( HDC hdc ) const * //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 repaint ( int x, int y, int w, int h ) + * //void repaint ( const QRect & rect ) + * //void repaint ( const QRegion & rgn ) + * //void resize ( int w, int h ) + * //void resize ( const QSize & ) + * //void scroll ( int dx, int dy ) + * //void scroll ( int dx, int dy, const QRect & r ) * // void setAccessibleDescription ( const QString & description ) * // void setAccessibleName ( const QString & name ) + * //void setBaseSize ( const QSize & ) + * //void setBaseSize ( int basew, int baseh ) * // void setEditFocus ( bool enable ) + * //void setFixedSize ( const QSize & s ) + * //void setFixedSize ( int w, int h ) + * //void setFocus ( Qt::FocusReason reason ) + * //void setGeometry ( const QRect & ) + * //void setGeometry ( int x, int y, int w, int h ) * // void setInputContext ( QInputContext * context ) + * //void setMask ( const QBitmap & bitmap ) + * //void setMask ( const QRegion & region ) + * //void setMaximumSize ( const QSize & ) + * //void setMaximumSize ( int maxw, int maxh ) + * //void setMinimumSize ( const QSize & ) + * //void setMinimumSize ( int minw, int minh ) + * //void setParent ( QWidget * parent ) + * //void setParent ( QWidget * parent, Qt::WindowFlags f ) + * //void setSizeIncrement ( const QSize & ) + * //void setSizeIncrement ( int w, int h ) + * //void setSizePolicy ( const QSizePolicy & policy ) + * //void setSizePolicy ( QSizePolicy::Policy horizontal, QSizePolicy::Policy vertical ) * // void setWindowSurface ( QWindowSurface * surface ) + * //void update ( int x, int y, int w, int h ) + * //void update ( const QRect & rect ) + * //void update ( const QRegion & rgn ) * //WId winId () const * // QWindowSurface * windowSurface () const (preliminary) * //Qt::HANDLE x11PictureHandle () const * //QWidget * find ( WId id ) + * //void repaint () + * //void setFocus () + * //void update () */ #include @@ -303,26 +358,21 @@ HB_FUNC( QT_QWIDGET_BASESIZE ) } /* - * QWidget * childAt ( int x, int y ) const + * QWidget * childAt ( ... ) */ HB_FUNC( QT_QWIDGET_CHILDAT ) { QWidget * p = hbqt_par_QWidget( 1 ); if( p ) { - hb_retptrGC( hbqt_gcAllocate_QWidget( ( p )->childAt( hb_parni( 2 ), hb_parni( 3 ) ), false ) ); - } -} - -/* - * QWidget * childAt ( const QPoint & p ) const - */ -HB_FUNC( QT_QWIDGET_CHILDAT_1 ) -{ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - hb_retptrGC( hbqt_gcAllocate_QWidget( ( p )->childAt( *hbqt_par_QPoint( 2 ) ), false ) ); + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + hb_retptrGC( hbqt_gcAllocate_QWidget( ( p )->childAt( *hbqt_par_QPoint( 2 ) ), false ) ); + } + else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) + { + hb_retptrGC( hbqt_gcAllocate_QWidget( ( p )->childAt( hb_parni( 2 ), hb_parni( 3 ) ), false ) ); + } } } @@ -577,26 +627,21 @@ HB_FUNC( QT_QWIDGET_GRABKEYBOARD ) } /* - * void grabMouse () + * void grabMouse ( ... ) */ HB_FUNC( QT_QWIDGET_GRABMOUSE ) { QWidget * p = hbqt_par_QWidget( 1 ); if( p ) { - ( p )->grabMouse(); - } -} - -/* - * void grabMouse ( const QCursor & cursor ) - */ -HB_FUNC( QT_QWIDGET_GRABMOUSE_1 ) -{ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - ( p )->grabMouse( *hbqt_par_QCursor( 2 ) ); + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->grabMouse( *hbqt_par_QCursor( 2 ) ); + } + else + { + ( p )->grabMouse(); + } } } @@ -1045,26 +1090,21 @@ HB_FUNC( QT_QWIDGET_MINIMUMWIDTH ) } /* - * void move ( int x, int y ) + * void move ( ... ) */ HB_FUNC( QT_QWIDGET_MOVE ) { QWidget * p = hbqt_par_QWidget( 1 ); if( p ) { - ( p )->move( hb_parni( 2 ), hb_parni( 3 ) ); - } -} - -/* - * void move ( const QPoint & ) - */ -HB_FUNC( QT_QWIDGET_MOVE_1 ) -{ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - ( p )->move( *hbqt_par_QPoint( 2 ) ); + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->move( *hbqt_par_QPoint( 2 ) ); + } + else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) + { + ( p )->move( hb_parni( 2 ), hb_parni( 3 ) ); + } } } @@ -1225,62 +1265,53 @@ HB_FUNC( QT_QWIDGET_REMOVEACTION ) } /* - * void repaint ( int x, int y, int w, int h ) + * void repaint ( ... ) */ HB_FUNC( QT_QWIDGET_REPAINT ) { QWidget * p = hbqt_par_QWidget( 1 ); if( p ) { - ( p )->repaint( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QRect ) + { + ( p )->repaint( *hbqt_par_QRect( 2 ) ); + } + else if( q->type == HBQT_TYPE_QRegion ) + { + ( p )->repaint( *hbqt_par_QRegion( 2 ) ); + } + } + else if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) + { + ( p )->repaint( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); + } + else + { + ( p )->repaint(); + } } } /* - * void repaint ( const QRect & rect ) - */ -HB_FUNC( QT_QWIDGET_REPAINT_1 ) -{ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - ( p )->repaint( *hbqt_par_QRect( 2 ) ); - } -} - -/* - * void repaint ( const QRegion & rgn ) - */ -HB_FUNC( QT_QWIDGET_REPAINT_2 ) -{ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - ( p )->repaint( *hbqt_par_QRegion( 2 ) ); - } -} - -/* - * void resize ( int w, int h ) + * void resize ( ... ) */ HB_FUNC( QT_QWIDGET_RESIZE ) { QWidget * p = hbqt_par_QWidget( 1 ); if( p ) { - ( p )->resize( hb_parni( 2 ), hb_parni( 3 ) ); - } -} - -/* - * void resize ( const QSize & ) - */ -HB_FUNC( QT_QWIDGET_RESIZE_1 ) -{ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - ( p )->resize( *hbqt_par_QSize( 2 ) ); + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->resize( *hbqt_par_QSize( 2 ) ); + } + else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) + { + ( p )->resize( hb_parni( 2 ), hb_parni( 3 ) ); + } } } @@ -1309,26 +1340,21 @@ HB_FUNC( QT_QWIDGET_SAVEGEOMETRY ) } /* - * void scroll ( int dx, int dy ) + * void scroll ( ... ) */ HB_FUNC( QT_QWIDGET_SCROLL ) { QWidget * p = hbqt_par_QWidget( 1 ); if( p ) { - ( p )->scroll( hb_parni( 2 ), hb_parni( 3 ) ); - } -} - -/* - * void scroll ( int dx, int dy, const QRect & r ) - */ -HB_FUNC( QT_QWIDGET_SCROLL_1 ) -{ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - ( p )->scroll( hb_parni( 2 ), hb_parni( 3 ), *hbqt_par_QRect( 4 ) ); + if( hb_pcount() == 4 && HB_ISNUM( 2 ) && HB_ISPOINTER( 4 ) ) + { + ( p )->scroll( hb_parni( 2 ), hb_parni( 3 ), *hbqt_par_QRect( 4 ) ); + } + else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) + { + ( p )->scroll( hb_parni( 2 ), hb_parni( 3 ) ); + } } } @@ -1381,26 +1407,21 @@ HB_FUNC( QT_QWIDGET_SETBACKGROUNDROLE ) } /* - * void setBaseSize ( const QSize & ) + * void setBaseSize ( ... ) */ HB_FUNC( QT_QWIDGET_SETBASESIZE ) { QWidget * p = hbqt_par_QWidget( 1 ); if( p ) { - ( p )->setBaseSize( *hbqt_par_QSize( 2 ) ); - } -} - -/* - * void setBaseSize ( int basew, int baseh ) - */ -HB_FUNC( QT_QWIDGET_SETBASESIZE_1 ) -{ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - ( p )->setBaseSize( hb_parni( 2 ), hb_parni( 3 ) ); + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->setBaseSize( *hbqt_par_QSize( 2 ) ); + } + else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) + { + ( p )->setBaseSize( hb_parni( 2 ), hb_parni( 3 ) ); + } } } @@ -1453,26 +1474,21 @@ HB_FUNC( QT_QWIDGET_SETFIXEDHEIGHT ) } /* - * void setFixedSize ( const QSize & s ) + * void setFixedSize ( ... ) */ HB_FUNC( QT_QWIDGET_SETFIXEDSIZE ) { QWidget * p = hbqt_par_QWidget( 1 ); if( p ) { - ( p )->setFixedSize( *hbqt_par_QSize( 2 ) ); - } -} - -/* - * void setFixedSize ( int w, int h ) - */ -HB_FUNC( QT_QWIDGET_SETFIXEDSIZE_1 ) -{ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - ( p )->setFixedSize( hb_parni( 2 ), hb_parni( 3 ) ); + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->setFixedSize( *hbqt_par_QSize( 2 ) ); + } + else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) + { + ( p )->setFixedSize( hb_parni( 2 ), hb_parni( 3 ) ); + } } } @@ -1489,14 +1505,21 @@ HB_FUNC( QT_QWIDGET_SETFIXEDWIDTH ) } /* - * void setFocus ( Qt::FocusReason reason ) + * void setFocus ( ... ) */ HB_FUNC( QT_QWIDGET_SETFOCUS ) { QWidget * p = hbqt_par_QWidget( 1 ); if( p ) { - ( p )->setFocus( ( Qt::FocusReason ) hb_parni( 2 ) ); + if( hb_pcount() == 2 && HB_ISNUM( 2 ) ) + { + ( p )->setFocus( ( Qt::FocusReason ) hb_parni( 2 ) ); + } + else + { + ( p )->setFocus(); + } } } @@ -1549,26 +1572,21 @@ HB_FUNC( QT_QWIDGET_SETFOREGROUNDROLE ) } /* - * void setGeometry ( const QRect & ) + * void setGeometry ( ... ) */ HB_FUNC( QT_QWIDGET_SETGEOMETRY ) { QWidget * p = hbqt_par_QWidget( 1 ); if( p ) { - ( p )->setGeometry( *hbqt_par_QRect( 2 ) ); - } -} - -/* - * void setGeometry ( int x, int y, int w, int h ) - */ -HB_FUNC( QT_QWIDGET_SETGEOMETRY_1 ) -{ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - ( p )->setGeometry( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->setGeometry( *hbqt_par_QRect( 2 ) ); + } + else if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) + { + ( p )->setGeometry( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); + } } } @@ -1609,26 +1627,23 @@ HB_FUNC( QT_QWIDGET_SETLOCALE ) } /* - * void setMask ( const QBitmap & bitmap ) + * void setMask ( ... ) */ HB_FUNC( QT_QWIDGET_SETMASK ) { QWidget * p = hbqt_par_QWidget( 1 ); if( p ) { - ( p )->setMask( *hbqt_par_QBitmap( 2 ) ); - } -} + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); -/* - * void setMask ( const QRegion & region ) - */ -HB_FUNC( QT_QWIDGET_SETMASK_1 ) -{ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - ( p )->setMask( *hbqt_par_QRegion( 2 ) ); + if( q->type == HBQT_TYPE_QBitmap ) + { + ( p )->setMask( *hbqt_par_QBitmap( 2 ) ); + } + else if( q->type == HBQT_TYPE_QRegion ) + { + ( p )->setMask( *hbqt_par_QRegion( 2 ) ); + } } } @@ -1645,26 +1660,21 @@ HB_FUNC( QT_QWIDGET_SETMAXIMUMHEIGHT ) } /* - * void setMaximumSize ( const QSize & ) + * void setMaximumSize ( ... ) */ HB_FUNC( QT_QWIDGET_SETMAXIMUMSIZE ) { QWidget * p = hbqt_par_QWidget( 1 ); if( p ) { - ( p )->setMaximumSize( *hbqt_par_QSize( 2 ) ); - } -} - -/* - * void setMaximumSize ( int maxw, int maxh ) - */ -HB_FUNC( QT_QWIDGET_SETMAXIMUMSIZE_1 ) -{ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - ( p )->setMaximumSize( hb_parni( 2 ), hb_parni( 3 ) ); + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->setMaximumSize( *hbqt_par_QSize( 2 ) ); + } + else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) + { + ( p )->setMaximumSize( hb_parni( 2 ), hb_parni( 3 ) ); + } } } @@ -1693,26 +1703,21 @@ HB_FUNC( QT_QWIDGET_SETMINIMUMHEIGHT ) } /* - * void setMinimumSize ( const QSize & ) + * void setMinimumSize ( ... ) */ HB_FUNC( QT_QWIDGET_SETMINIMUMSIZE ) { QWidget * p = hbqt_par_QWidget( 1 ); if( p ) { - ( p )->setMinimumSize( *hbqt_par_QSize( 2 ) ); - } -} - -/* - * void setMinimumSize ( int minw, int minh ) - */ -HB_FUNC( QT_QWIDGET_SETMINIMUMSIZE_1 ) -{ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - ( p )->setMinimumSize( hb_parni( 2 ), hb_parni( 3 ) ); + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->setMinimumSize( *hbqt_par_QSize( 2 ) ); + } + else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) + { + ( p )->setMinimumSize( hb_parni( 2 ), hb_parni( 3 ) ); + } } } @@ -1753,26 +1758,21 @@ HB_FUNC( QT_QWIDGET_SETPALETTE ) } /* - * void setParent ( QWidget * parent ) + * void setParent ( ... ) */ HB_FUNC( QT_QWIDGET_SETPARENT ) { QWidget * p = hbqt_par_QWidget( 1 ); if( p ) { - ( p )->setParent( hbqt_par_QWidget( 2 ) ); - } -} - -/* - * void setParent ( QWidget * parent, Qt::WindowFlags f ) - */ -HB_FUNC( QT_QWIDGET_SETPARENT_1 ) -{ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - ( p )->setParent( hbqt_par_QWidget( 2 ), ( Qt::WindowFlags ) hb_parni( 3 ) ); + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->setParent( hbqt_par_QWidget( 2 ) ); + } + else if( hb_pcount() == 3 && HB_ISPOINTER( 2 ) && HB_ISNUM( 3 ) ) + { + ( p )->setParent( hbqt_par_QWidget( 2 ), ( Qt::WindowFlags ) hb_parni( 3 ) ); + } } } @@ -1801,50 +1801,40 @@ HB_FUNC( QT_QWIDGET_SETSHORTCUTENABLED ) } /* - * void setSizeIncrement ( const QSize & ) + * void setSizeIncrement ( ... ) */ HB_FUNC( QT_QWIDGET_SETSIZEINCREMENT ) { QWidget * p = hbqt_par_QWidget( 1 ); if( p ) { - ( p )->setSizeIncrement( *hbqt_par_QSize( 2 ) ); + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->setSizeIncrement( *hbqt_par_QSize( 2 ) ); + } + else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) + { + ( p )->setSizeIncrement( hb_parni( 2 ), hb_parni( 3 ) ); + } } } /* - * void setSizeIncrement ( int w, int h ) - */ -HB_FUNC( QT_QWIDGET_SETSIZEINCREMENT_1 ) -{ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - ( p )->setSizeIncrement( hb_parni( 2 ), hb_parni( 3 ) ); - } -} - -/* - * void setSizePolicy ( const QSizePolicy & policy ) + * void setSizePolicy ( ... ) */ HB_FUNC( QT_QWIDGET_SETSIZEPOLICY ) { QWidget * p = hbqt_par_QWidget( 1 ); if( p ) { - ( p )->setSizePolicy( *hbqt_par_QSizePolicy( 2 ) ); - } -} - -/* - * void setSizePolicy ( QSizePolicy::Policy horizontal, QSizePolicy::Policy vertical ) - */ -HB_FUNC( QT_QWIDGET_SETSIZEPOLICY_1 ) -{ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - ( p )->setSizePolicy( ( QSizePolicy::Policy ) hb_parni( 2 ), ( QSizePolicy::Policy ) hb_parni( 3 ) ); + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->setSizePolicy( *hbqt_par_QSizePolicy( 2 ) ); + } + else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) + { + ( p )->setSizePolicy( ( QSizePolicy::Policy ) hb_parni( 2 ), ( QSizePolicy::Policy ) hb_parni( 3 ) ); + } } } @@ -2185,38 +2175,34 @@ HB_FUNC( QT_QWIDGET_UNSETLOCALE ) } /* - * void update ( int x, int y, int w, int h ) + * void update ( ... ) */ HB_FUNC( QT_QWIDGET_UPDATE ) { QWidget * p = hbqt_par_QWidget( 1 ); if( p ) { - ( p )->update( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); - } -} + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); -/* - * void update ( const QRect & rect ) - */ -HB_FUNC( QT_QWIDGET_UPDATE_1 ) -{ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - ( p )->update( *hbqt_par_QRect( 2 ) ); - } -} - -/* - * void update ( const QRegion & rgn ) - */ -HB_FUNC( QT_QWIDGET_UPDATE_2 ) -{ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - ( p )->update( *hbqt_par_QRegion( 2 ) ); + if( q->type == HBQT_TYPE_QRect ) + { + ( p )->update( *hbqt_par_QRect( 2 ) ); + } + else if( q->type == HBQT_TYPE_QRegion ) + { + ( p )->update( *hbqt_par_QRegion( 2 ) ); + } + } + else if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) + { + ( p )->update( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); + } + else + { + ( p )->update(); + } } } @@ -2520,18 +2506,6 @@ HB_FUNC( QT_QWIDGET_RAISE ) } } -/* - * void repaint () - */ -HB_FUNC( QT_QWIDGET_REPAINT_3 ) -{ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - ( p )->repaint(); - } -} - /* * void setDisabled ( bool disable ) */ @@ -2556,18 +2530,6 @@ HB_FUNC( QT_QWIDGET_SETENABLED ) } } -/* - * void setFocus () - */ -HB_FUNC( QT_QWIDGET_SETFOCUS_1 ) -{ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - ( p )->setFocus(); - } -} - /* * void setHidden ( bool hidden ) */ @@ -2692,18 +2654,6 @@ HB_FUNC( QT_QWIDGET_SHOWNORMAL ) } } -/* - * void update () - */ -HB_FUNC( QT_QWIDGET_UPDATE_3 ) -{ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - ( p )->update(); - } -} - /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ diff --git a/harbour/contrib/hbqt/qtgui/g/TQWidget.prg b/harbour/contrib/hbqt/qtgui/g/TQWidget.prg index 7bc3dfbe00..982b3ed7c2 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQWidget.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQWidget.prg @@ -79,8 +79,7 @@ CREATE CLASS QWidget INHERIT HbQtObjectHandler, HB_QObject, HB_QPaintDevice FUNC METHOD autoFillBackground() METHOD backgroundRole() METHOD baseSize() - METHOD childAt( nX, nY ) - METHOD childAt_1( pP ) + METHOD childAt( ... ) METHOD childrenRect() METHOD childrenRegion() METHOD clearFocus() @@ -101,8 +100,7 @@ CREATE CLASS QWidget INHERIT HbQtObjectHandler, HB_QObject, HB_QPaintDevice FUNC METHOD geometry() METHOD getContentsMargins( nLeft, nTop, nRight, nBottom ) METHOD grabKeyboard() - METHOD grabMouse() - METHOD grabMouse_1( pCursor ) + METHOD grabMouse( ... ) METHOD grabShortcut( pKey, nContext ) METHOD hasFocus() METHOD hasMouseTracking() @@ -140,8 +138,7 @@ CREATE CLASS QWidget INHERIT HbQtObjectHandler, HB_QObject, HB_QPaintDevice FUNC METHOD minimumSize() METHOD minimumSizeHint() METHOD minimumWidth() - METHOD move( nX, nY ) - METHOD move_1( pQPoint ) + METHOD move( ... ) METHOD nativeParentWidget() METHOD nextInFocusChain() METHOD normalGeometry() @@ -155,58 +152,45 @@ CREATE CLASS QWidget INHERIT HbQtObjectHandler, HB_QObject, HB_QPaintDevice FUNC METHOD releaseMouse() METHOD releaseShortcut( nId ) METHOD removeAction( pAction ) - METHOD repaint( nX, nY, nW, nH ) - METHOD repaint_1( pRect ) - METHOD repaint_2( pRgn ) - METHOD resize( nW, nH ) - METHOD resize_1( pQSize ) + METHOD repaint( ... ) + METHOD resize( ... ) METHOD restoreGeometry( pGeometry ) METHOD saveGeometry() - METHOD scroll( nDx, nDy ) - METHOD scroll_1( nDx, nDy, pR ) + METHOD scroll( ... ) METHOD setAcceptDrops( lOn ) METHOD setAttribute( nAttribute, lOn ) METHOD setAutoFillBackground( lEnabled ) METHOD setBackgroundRole( nRole ) - METHOD setBaseSize( pQSize ) - METHOD setBaseSize_1( nBasew, nBaseh ) + METHOD setBaseSize( ... ) METHOD setContentsMargins( nLeft, nTop, nRight, nBottom ) METHOD setContextMenuPolicy( nPolicy ) METHOD setCursor( pQCursor ) METHOD setFixedHeight( nH ) - METHOD setFixedSize( pS ) - METHOD setFixedSize_1( nW, nH ) + METHOD setFixedSize( ... ) METHOD setFixedWidth( nW ) - METHOD setFocus( nReason ) + METHOD setFocus( ... ) METHOD setFocusPolicy( nPolicy ) METHOD setFocusProxy( pW ) METHOD setFont( pQFont ) METHOD setForegroundRole( nRole ) - METHOD setGeometry( pQRect ) - METHOD setGeometry_1( nX, nY, nW, nH ) + METHOD setGeometry( ... ) METHOD setLayout( pLayout ) METHOD setLayoutDirection( nDirection ) METHOD setLocale( pLocale ) - METHOD setMask( pBitmap ) - METHOD setMask_1( pRegion ) + METHOD setMask( ... ) METHOD setMaximumHeight( nMaxh ) - METHOD setMaximumSize( pQSize ) - METHOD setMaximumSize_1( nMaxw, nMaxh ) + METHOD setMaximumSize( ... ) METHOD setMaximumWidth( nMaxw ) METHOD setMinimumHeight( nMinh ) - METHOD setMinimumSize( pQSize ) - METHOD setMinimumSize_1( nMinw, nMinh ) + METHOD setMinimumSize( ... ) METHOD setMinimumWidth( nMinw ) METHOD setMouseTracking( lEnable ) METHOD setPalette( pQPalette ) - METHOD setParent( pParent ) - METHOD setParent_1( pParent, nF ) + METHOD setParent( ... ) METHOD setShortcutAutoRepeat( nId, lEnable ) METHOD setShortcutEnabled( nId, lEnable ) - METHOD setSizeIncrement( pQSize ) - METHOD setSizeIncrement_1( nW, nH ) - METHOD setSizePolicy( pPolicy ) - METHOD setSizePolicy_1( nHorizontal, nVertical ) + METHOD setSizeIncrement( ... ) + METHOD setSizePolicy( ... ) METHOD setStatusTip( cQString ) METHOD setStyle( pStyle ) METHOD setToolTip( cQString ) @@ -234,9 +218,7 @@ CREATE CLASS QWidget INHERIT HbQtObjectHandler, HB_QObject, HB_QPaintDevice FUNC METHOD unsetCursor() METHOD unsetLayoutDirection() METHOD unsetLocale() - METHOD update( nX, nY, nW, nH ) - METHOD update_1( pRect ) - METHOD update_2( pRgn ) + METHOD update( ... ) METHOD updateGeometry() METHOD updatesEnabled() METHOD visibleRegion() @@ -262,10 +244,8 @@ CREATE CLASS QWidget INHERIT HbQtObjectHandler, HB_QObject, HB_QPaintDevice FUNC METHOD hide() METHOD lower() METHOD raise() - METHOD repaint_3() METHOD setDisabled( lDisable ) METHOD setEnabled( lEnable ) - METHOD setFocus_1() METHOD setHidden( lHidden ) METHOD setStyleSheet( cStyleSheet ) METHOD setVisible( lVisible ) @@ -276,7 +256,6 @@ CREATE CLASS QWidget INHERIT HbQtObjectHandler, HB_QObject, HB_QPaintDevice FUNC METHOD showMaximized() METHOD showMinimized() METHOD showNormal() - METHOD update_3() ENDCLASS @@ -322,12 +301,12 @@ METHOD QWidget:baseSize() RETURN Qt_QWidget_baseSize( ::pPtr ) -METHOD QWidget:childAt( nX, nY ) - RETURN Qt_QWidget_childAt( ::pPtr, nX, nY ) - - -METHOD QWidget:childAt_1( pP ) - RETURN Qt_QWidget_childAt_1( ::pPtr, hbqt_ptr( pP ) ) +METHOD QWidget:childAt( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QWidget_childAt( ::pPtr, ... ) METHOD QWidget:childrenRect() @@ -410,12 +389,12 @@ METHOD QWidget:grabKeyboard() RETURN Qt_QWidget_grabKeyboard( ::pPtr ) -METHOD QWidget:grabMouse() - RETURN Qt_QWidget_grabMouse( ::pPtr ) - - -METHOD QWidget:grabMouse_1( pCursor ) - RETURN Qt_QWidget_grabMouse_1( ::pPtr, hbqt_ptr( pCursor ) ) +METHOD QWidget:grabMouse( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QWidget_grabMouse( ::pPtr, ... ) METHOD QWidget:grabShortcut( pKey, nContext ) @@ -566,12 +545,12 @@ METHOD QWidget:minimumWidth() RETURN Qt_QWidget_minimumWidth( ::pPtr ) -METHOD QWidget:move( nX, nY ) - RETURN Qt_QWidget_move( ::pPtr, nX, nY ) - - -METHOD QWidget:move_1( pQPoint ) - RETURN Qt_QWidget_move_1( ::pPtr, hbqt_ptr( pQPoint ) ) +METHOD QWidget:move( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QWidget_move( ::pPtr, ... ) METHOD QWidget:nativeParentWidget() @@ -626,24 +605,20 @@ METHOD QWidget:removeAction( pAction ) RETURN Qt_QWidget_removeAction( ::pPtr, hbqt_ptr( pAction ) ) -METHOD QWidget:repaint( nX, nY, nW, nH ) - RETURN Qt_QWidget_repaint( ::pPtr, nX, nY, nW, nH ) +METHOD QWidget:repaint( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QWidget_repaint( ::pPtr, ... ) -METHOD QWidget:repaint_1( pRect ) - RETURN Qt_QWidget_repaint_1( ::pPtr, hbqt_ptr( pRect ) ) - - -METHOD QWidget:repaint_2( pRgn ) - RETURN Qt_QWidget_repaint_2( ::pPtr, hbqt_ptr( pRgn ) ) - - -METHOD QWidget:resize( nW, nH ) - RETURN Qt_QWidget_resize( ::pPtr, nW, nH ) - - -METHOD QWidget:resize_1( pQSize ) - RETURN Qt_QWidget_resize_1( ::pPtr, hbqt_ptr( pQSize ) ) +METHOD QWidget:resize( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QWidget_resize( ::pPtr, ... ) METHOD QWidget:restoreGeometry( pGeometry ) @@ -654,12 +629,12 @@ METHOD QWidget:saveGeometry() RETURN Qt_QWidget_saveGeometry( ::pPtr ) -METHOD QWidget:scroll( nDx, nDy ) - RETURN Qt_QWidget_scroll( ::pPtr, nDx, nDy ) - - -METHOD QWidget:scroll_1( nDx, nDy, pR ) - RETURN Qt_QWidget_scroll_1( ::pPtr, nDx, nDy, hbqt_ptr( pR ) ) +METHOD QWidget:scroll( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QWidget_scroll( ::pPtr, ... ) METHOD QWidget:setAcceptDrops( lOn ) @@ -678,12 +653,12 @@ METHOD QWidget:setBackgroundRole( nRole ) RETURN Qt_QWidget_setBackgroundRole( ::pPtr, nRole ) -METHOD QWidget:setBaseSize( pQSize ) - RETURN Qt_QWidget_setBaseSize( ::pPtr, hbqt_ptr( pQSize ) ) - - -METHOD QWidget:setBaseSize_1( nBasew, nBaseh ) - RETURN Qt_QWidget_setBaseSize_1( ::pPtr, nBasew, nBaseh ) +METHOD QWidget:setBaseSize( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QWidget_setBaseSize( ::pPtr, ... ) METHOD QWidget:setContentsMargins( nLeft, nTop, nRight, nBottom ) @@ -702,20 +677,24 @@ METHOD QWidget:setFixedHeight( nH ) RETURN Qt_QWidget_setFixedHeight( ::pPtr, nH ) -METHOD QWidget:setFixedSize( pS ) - RETURN Qt_QWidget_setFixedSize( ::pPtr, hbqt_ptr( pS ) ) - - -METHOD QWidget:setFixedSize_1( nW, nH ) - RETURN Qt_QWidget_setFixedSize_1( ::pPtr, nW, nH ) +METHOD QWidget:setFixedSize( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QWidget_setFixedSize( ::pPtr, ... ) METHOD QWidget:setFixedWidth( nW ) RETURN Qt_QWidget_setFixedWidth( ::pPtr, nW ) -METHOD QWidget:setFocus( nReason ) - RETURN Qt_QWidget_setFocus( ::pPtr, nReason ) +METHOD QWidget:setFocus( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QWidget_setFocus( ::pPtr, ... ) METHOD QWidget:setFocusPolicy( nPolicy ) @@ -734,12 +713,12 @@ METHOD QWidget:setForegroundRole( nRole ) RETURN Qt_QWidget_setForegroundRole( ::pPtr, nRole ) -METHOD QWidget:setGeometry( pQRect ) - RETURN Qt_QWidget_setGeometry( ::pPtr, hbqt_ptr( pQRect ) ) - - -METHOD QWidget:setGeometry_1( nX, nY, nW, nH ) - RETURN Qt_QWidget_setGeometry_1( ::pPtr, nX, nY, nW, nH ) +METHOD QWidget:setGeometry( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QWidget_setGeometry( ::pPtr, ... ) METHOD QWidget:setLayout( pLayout ) @@ -754,24 +733,24 @@ METHOD QWidget:setLocale( pLocale ) RETURN Qt_QWidget_setLocale( ::pPtr, hbqt_ptr( pLocale ) ) -METHOD QWidget:setMask( pBitmap ) - RETURN Qt_QWidget_setMask( ::pPtr, hbqt_ptr( pBitmap ) ) - - -METHOD QWidget:setMask_1( pRegion ) - RETURN Qt_QWidget_setMask_1( ::pPtr, hbqt_ptr( pRegion ) ) +METHOD QWidget:setMask( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QWidget_setMask( ::pPtr, ... ) METHOD QWidget:setMaximumHeight( nMaxh ) RETURN Qt_QWidget_setMaximumHeight( ::pPtr, nMaxh ) -METHOD QWidget:setMaximumSize( pQSize ) - RETURN Qt_QWidget_setMaximumSize( ::pPtr, hbqt_ptr( pQSize ) ) - - -METHOD QWidget:setMaximumSize_1( nMaxw, nMaxh ) - RETURN Qt_QWidget_setMaximumSize_1( ::pPtr, nMaxw, nMaxh ) +METHOD QWidget:setMaximumSize( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QWidget_setMaximumSize( ::pPtr, ... ) METHOD QWidget:setMaximumWidth( nMaxw ) @@ -782,12 +761,12 @@ METHOD QWidget:setMinimumHeight( nMinh ) RETURN Qt_QWidget_setMinimumHeight( ::pPtr, nMinh ) -METHOD QWidget:setMinimumSize( pQSize ) - RETURN Qt_QWidget_setMinimumSize( ::pPtr, hbqt_ptr( pQSize ) ) - - -METHOD QWidget:setMinimumSize_1( nMinw, nMinh ) - RETURN Qt_QWidget_setMinimumSize_1( ::pPtr, nMinw, nMinh ) +METHOD QWidget:setMinimumSize( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QWidget_setMinimumSize( ::pPtr, ... ) METHOD QWidget:setMinimumWidth( nMinw ) @@ -802,12 +781,12 @@ METHOD QWidget:setPalette( pQPalette ) RETURN Qt_QWidget_setPalette( ::pPtr, hbqt_ptr( pQPalette ) ) -METHOD QWidget:setParent( pParent ) - RETURN Qt_QWidget_setParent( ::pPtr, hbqt_ptr( pParent ) ) - - -METHOD QWidget:setParent_1( pParent, nF ) - RETURN Qt_QWidget_setParent_1( ::pPtr, hbqt_ptr( pParent ), nF ) +METHOD QWidget:setParent( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QWidget_setParent( ::pPtr, ... ) METHOD QWidget:setShortcutAutoRepeat( nId, lEnable ) @@ -818,20 +797,20 @@ METHOD QWidget:setShortcutEnabled( nId, lEnable ) RETURN Qt_QWidget_setShortcutEnabled( ::pPtr, nId, lEnable ) -METHOD QWidget:setSizeIncrement( pQSize ) - RETURN Qt_QWidget_setSizeIncrement( ::pPtr, hbqt_ptr( pQSize ) ) +METHOD QWidget:setSizeIncrement( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QWidget_setSizeIncrement( ::pPtr, ... ) -METHOD QWidget:setSizeIncrement_1( nW, nH ) - RETURN Qt_QWidget_setSizeIncrement_1( ::pPtr, nW, nH ) - - -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:setSizePolicy( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QWidget_setSizePolicy( ::pPtr, ... ) METHOD QWidget:setStatusTip( cQString ) @@ -942,16 +921,12 @@ METHOD QWidget:unsetLocale() RETURN Qt_QWidget_unsetLocale( ::pPtr ) -METHOD QWidget:update( nX, nY, nW, nH ) - RETURN Qt_QWidget_update( ::pPtr, nX, nY, nW, nH ) - - -METHOD QWidget:update_1( pRect ) - RETURN Qt_QWidget_update_1( ::pPtr, hbqt_ptr( pRect ) ) - - -METHOD QWidget:update_2( pRgn ) - RETURN Qt_QWidget_update_2( ::pPtr, hbqt_ptr( pRgn ) ) +METHOD QWidget:update( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QWidget_update( ::pPtr, ... ) METHOD QWidget:updateGeometry() @@ -1054,10 +1029,6 @@ METHOD QWidget:raise() RETURN Qt_QWidget_raise( ::pPtr ) -METHOD QWidget:repaint_3() - RETURN Qt_QWidget_repaint_3( ::pPtr ) - - METHOD QWidget:setDisabled( lDisable ) RETURN Qt_QWidget_setDisabled( ::pPtr, lDisable ) @@ -1066,10 +1037,6 @@ METHOD QWidget:setEnabled( lEnable ) RETURN Qt_QWidget_setEnabled( ::pPtr, lEnable ) -METHOD QWidget:setFocus_1() - RETURN Qt_QWidget_setFocus_1( ::pPtr ) - - METHOD QWidget:setHidden( lHidden ) RETURN Qt_QWidget_setHidden( ::pPtr, lHidden ) @@ -1109,7 +1076,3 @@ METHOD QWidget:showMinimized() METHOD QWidget:showNormal() RETURN Qt_QWidget_showNormal( ::pPtr ) - -METHOD QWidget:update_3() - RETURN Qt_QWidget_update_3( ::pPtr ) - diff --git a/harbour/contrib/hbqt/qtgui/qth/QWidget.qth b/harbour/contrib/hbqt/qtgui/qth/QWidget.qth index f4833f0292..8546e01e77 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QWidget.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QWidget.qth @@ -112,8 +112,24 @@ void adjustSize () bool autoFillBackground () const QPalette::ColorRole backgroundRole () const QSize baseSize () const -QWidget * childAt ( int x, int y ) const -QWidget * childAt ( const QPoint & p ) const + +QWidget * childAt ( ... ){ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + hb_retptrGC( hbqt_gcAllocate_QWidget( ( p )->childAt( *hbqt_par_QPoint( 2 ) ), false ) ); + } + else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) + { + hb_retptrGC( hbqt_gcAllocate_QWidget( ( p )->childAt( hb_parni( 2 ), hb_parni( 3 ) ), false ) ); + } + } +} +//QWidget * childAt ( int x, int y ) const +//QWidget * childAt ( const QPoint & p ) const + QRect childrenRect () const QRegion childrenRegion () const void clearFocus () @@ -139,8 +155,24 @@ void getContentsMargins ( int * left, int * top, int * right, int * bottom ) con # non-portable // virtual HDC getDC () const void grabKeyboard () -void grabMouse () -void grabMouse ( const QCursor & cursor ) + +void grabMouse ( ... ){ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->grabMouse( *hbqt_par_QCursor( 2 ) ); + } + else + { + ( p )->grabMouse(); + } + } +} +//void grabMouse () +//void grabMouse ( const QCursor & cursor ) + int grabShortcut ( const QKeySequence & key, Qt::ShortcutContext context = Qt::WindowShortcut ) // QGraphicsProxyWidget * graphicsProxyWidget () const // bool hasEditFocus () const @@ -184,14 +216,24 @@ int minimumHeight () const QSize minimumSize () const virtual QSize minimumSizeHint () const int minimumWidth () const -# -# Note that order of the function calls is swaped -# It implies that we can implement the method in a simpler way -# Infact we can remove second method with QPoint as it needs more code -# -void move ( int x, int y ) -void move ( const QPoint & ) -# + +void move ( ... ){ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->move( *hbqt_par_QPoint( 2 ) ); + } + else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) + { + ( p )->move( hb_parni( 2 ), hb_parni( 3 ) ); + } + } +} +//void move ( int x, int y ) +//void move ( const QPoint & ) + QWidget * nativeParentWidget () const QWidget * nextInFocusChain () const QRect normalGeometry () const @@ -209,73 +251,283 @@ void releaseShortcut ( int id ) void removeAction ( QAction * action ) //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 ) ) -# -# As a normalized behavior, int types are the best. -# -void repaint ( int x, int y, int w, int h ) -void repaint ( const QRect & rect ) -void repaint ( const QRegion & rgn ) -# -# Please never change this order as it is considered natural -# -void resize ( int w, int h ) -void resize ( const QSize & ) -# + +void repaint ( ... ){ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QRect ) + { + ( p )->repaint( *hbqt_par_QRect( 2 ) ); + } + else if( q->type == HBQT_TYPE_QRegion ) + { + ( p )->repaint( *hbqt_par_QRegion( 2 ) ); + } + } + else if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) + { + ( p )->repaint( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); + } + else + { + ( p )->repaint(); + } + } +} +//void repaint ( int x, int y, int w, int h ) +//void repaint ( const QRect & rect ) +//void repaint ( const QRegion & rgn ) + +void resize ( ... ){ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->resize( *hbqt_par_QSize( 2 ) ); + } + else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) + { + ( p )->resize( hb_parni( 2 ), hb_parni( 3 ) ); + } + } +} +//void resize ( int w, int h ) +//void resize ( const QSize & ) + bool restoreGeometry ( const QByteArray & geometry ) QByteArray saveGeometry () const -# -# Normalized behavior -# -void scroll ( int dx, int dy ) -void scroll ( int dx, int dy, const QRect & r ) -# + +void scroll ( ... ){ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + if( hb_pcount() == 4 && HB_ISNUM( 2 ) && HB_ISPOINTER( 4 ) ) + { + ( p )->scroll( hb_parni( 2 ), hb_parni( 3 ), *hbqt_par_QRect( 4 ) ); + } + else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) + { + ( p )->scroll( hb_parni( 2 ), hb_parni( 3 ) ); + } + } +} +//void scroll ( int dx, int dy ) +//void scroll ( int dx, int dy, const QRect & r ) + void setAcceptDrops ( bool on ) // void setAccessibleDescription ( const QString & description ) // void setAccessibleName ( const QString & name ) void setAttribute ( Qt::WidgetAttribute attribute, bool on = true ) void setAutoFillBackground ( bool enabled ) void setBackgroundRole ( QPalette::ColorRole role ) -void setBaseSize ( const QSize & ) -void setBaseSize ( int basew, int baseh ) + +void setBaseSize ( ... ){ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->setBaseSize( *hbqt_par_QSize( 2 ) ); + } + else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) + { + ( p )->setBaseSize( hb_parni( 2 ), hb_parni( 3 ) ); + } + } +} +//void setBaseSize ( const QSize & ) +//void setBaseSize ( int basew, int baseh ) + void setContentsMargins ( int left, int top, int right, int bottom ) void setContextMenuPolicy ( Qt::ContextMenuPolicy policy ) void setCursor ( const QCursor & ) // void setEditFocus ( bool enable ) void setFixedHeight ( int h ) -void setFixedSize ( const QSize & s ) -void setFixedSize ( int w, int h ) + +void setFixedSize ( ... ){ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->setFixedSize( *hbqt_par_QSize( 2 ) ); + } + else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) + { + ( p )->setFixedSize( hb_parni( 2 ), hb_parni( 3 ) ); + } + } +} +//void setFixedSize ( const QSize & s ) +//void setFixedSize ( int w, int h ) + void setFixedWidth ( int w ) -void setFocus ( Qt::FocusReason reason ) + +void setFocus ( ... ){ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + if( hb_pcount() == 2 && HB_ISNUM( 2 ) ) + { + ( p )->setFocus( ( Qt::FocusReason ) hb_parni( 2 ) ); + } + else + { + ( p )->setFocus(); + } + } +} +//void setFocus ( Qt::FocusReason reason ) + void setFocusPolicy ( Qt::FocusPolicy policy ) void setFocusProxy ( QWidget * w ) void setFont ( const QFont & ) void setForegroundRole ( QPalette::ColorRole role ) -void setGeometry ( const QRect & ) -void setGeometry ( int x, int y, int w, int h ) + +void setGeometry ( ... ){ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->setGeometry( *hbqt_par_QRect( 2 ) ); + } + else if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) + { + ( p )->setGeometry( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); + } + } +} +//void setGeometry ( const QRect & ) +//void setGeometry ( int x, int y, int w, int h ) + // void setInputContext ( QInputContext * context ) void setLayout ( QLayout * layout ) void setLayoutDirection ( Qt::LayoutDirection direction ) void setLocale ( const QLocale & locale ) -void setMask ( const QBitmap & bitmap ) -void setMask ( const QRegion & region ) + +void setMask ( ... ){ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QBitmap ) + { + ( p )->setMask( *hbqt_par_QBitmap( 2 ) ); + } + else if( q->type == HBQT_TYPE_QRegion ) + { + ( p )->setMask( *hbqt_par_QRegion( 2 ) ); + } + } +} +//void setMask ( const QBitmap & bitmap ) +//void setMask ( const QRegion & region ) + void setMaximumHeight ( int maxh ) -void setMaximumSize ( const QSize & ) -void setMaximumSize ( int maxw, int maxh ) + +void setMaximumSize ( ... ){ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->setMaximumSize( *hbqt_par_QSize( 2 ) ); + } + else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) + { + ( p )->setMaximumSize( hb_parni( 2 ), hb_parni( 3 ) ); + } + } +} +//void setMaximumSize ( const QSize & ) +//void setMaximumSize ( int maxw, int maxh ) + void setMaximumWidth ( int maxw ) void setMinimumHeight ( int minh ) -void setMinimumSize ( const QSize & ) -void setMinimumSize ( int minw, int minh ) + +void setMinimumSize ( ... ){ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->setMinimumSize( *hbqt_par_QSize( 2 ) ); + } + else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) + { + ( p )->setMinimumSize( hb_parni( 2 ), hb_parni( 3 ) ); + } + } +} +//void setMinimumSize ( const QSize & ) +//void setMinimumSize ( int minw, int minh ) + void setMinimumWidth ( int minw ) void setMouseTracking ( bool enable ) void setPalette ( const QPalette & ) -void setParent ( QWidget * parent ) -void setParent ( QWidget * parent, Qt::WindowFlags f ) + +void setParent ( ... ){ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->setParent( hbqt_par_QWidget( 2 ) ); + } + else if( hb_pcount() == 3 && HB_ISPOINTER( 2 ) && HB_ISNUM( 3 ) ) + { + ( p )->setParent( hbqt_par_QWidget( 2 ), ( Qt::WindowFlags ) hb_parni( 3 ) ); + } + } +} +//void setParent ( QWidget * parent ) +//void setParent ( QWidget * parent, Qt::WindowFlags f ) + void setShortcutAutoRepeat ( int id, bool enable = true ) void setShortcutEnabled ( int id, bool enable = true ) -void setSizeIncrement ( const QSize & ) -void setSizeIncrement ( int w, int h ) -void setSizePolicy ( const QSizePolicy & policy ) -void setSizePolicy ( QSizePolicy::Policy horizontal, QSizePolicy::Policy vertical ) + +void setSizeIncrement ( ... ){ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->setSizeIncrement( *hbqt_par_QSize( 2 ) ); + } + else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) + { + ( p )->setSizeIncrement( hb_parni( 2 ), hb_parni( 3 ) ); + } + } +} +//void setSizeIncrement ( const QSize & ) +//void setSizeIncrement ( int w, int h ) + +void setSizePolicy ( ... ){ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->setSizePolicy( *hbqt_par_QSizePolicy( 2 ) ); + } + else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) + { + ( p )->setSizePolicy( ( QSizePolicy::Policy ) hb_parni( 2 ), ( QSizePolicy::Policy ) hb_parni( 3 ) ); + } + } +} +//void setSizePolicy ( const QSizePolicy & policy ) +//void setSizePolicy ( QSizePolicy::Policy horizontal, QSizePolicy::Policy vertical ) + void setStatusTip ( const QString & ) void setStyle ( QStyle * style ) void setToolTip ( const QString & ) @@ -289,7 +541,7 @@ void setWindowModality ( Qt::WindowModality windowModality ) void setWindowOpacity ( qreal level ) void setWindowRole ( const QString & role ) void setWindowState ( Qt::WindowStates windowState ) -// void setWindowSurface ( QWindowSurface * surface ) +// void setWindowSurface ( QWindowSurface * surface ) QSize size () const virtual QSize sizeHint () const QSize sizeIncrement () const @@ -304,9 +556,38 @@ bool underMouse () const void unsetCursor () void unsetLayoutDirection () void unsetLocale () -void update ( int x, int y, int w, int h ) -void update ( const QRect & rect ) -void update ( const QRegion & rgn ) + +void update ( ... ){ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QRect ) + { + ( p )->update( *hbqt_par_QRect( 2 ) ); + } + else if( q->type == HBQT_TYPE_QRegion ) + { + ( p )->update( *hbqt_par_QRegion( 2 ) ); + } + } + else if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) + { + ( p )->update( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); + } + else + { + ( p )->update(); + } + } +} +//void update ( int x, int y, int w, int h ) +//void update ( const QRect & rect ) +//void update ( const QRegion & rgn ) + void updateGeometry () bool updatesEnabled () const QRegion visibleRegion () const @@ -340,10 +621,10 @@ bool close () void hide () void lower () void raise () -void repaint () +//void repaint () void setDisabled ( bool disable ) void setEnabled ( bool enable ) -void setFocus () +//void setFocus () void setHidden ( bool hidden ) void setStyleSheet ( const QString & styleSheet ) virtual void setVisible ( bool visible ) @@ -354,7 +635,7 @@ void showFullScreen () void showMaximized () void showMinimized () void showNormal () -void update () +//void update () diff --git a/harbour/contrib/hbxbp/xbppushbutton.prg b/harbour/contrib/hbxbp/xbppushbutton.prg index 8981d300c3..1b0d30f5cb 100644 --- a/harbour/contrib/hbxbp/xbppushbutton.prg +++ b/harbour/contrib/hbxbp/xbppushbutton.prg @@ -218,7 +218,7 @@ METHOD XbpPushButton:setFocus() IF !( ::oWidget:isDefault() ) ::oWidget:setDefault( .t. ) ENDIF - ::oWidget:setFocus_1() + ::oWidget:setFocus() RETURN Self diff --git a/harbour/contrib/hbxbp/xbpwindow.prg b/harbour/contrib/hbxbp/xbpwindow.prg index 8f0f6c4a52..3afd816653 100644 --- a/harbour/contrib/hbxbp/xbpwindow.prg +++ b/harbour/contrib/hbxbp/xbpwindow.prg @@ -1662,7 +1662,7 @@ METHOD XbpWindow:Initialize( oParent, oOwner, aPos, aSize, aPresParams, lVisible METHOD XbpWindow:setFocus() - ::oWidget:setFocus_1() + ::oWidget:setFocus() RETURN Self