2010-09-15 14:35 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbqt/hbqt_hbmk2_plugin.hbs
* contrib/hbqt/qtgui/g/QGraphicsEllipseItem.cpp
* contrib/hbqt/qtgui/g/QGraphicsLineItem.cpp
* contrib/hbqt/qtgui/g/QGraphicsPathItem.cpp
* contrib/hbqt/qtgui/g/QGraphicsPixmapItem.cpp
* contrib/hbqt/qtgui/g/QGraphicsPolygonItem.cpp
* contrib/hbqt/qtgui/g/QGraphicsRectItem.cpp
* contrib/hbqt/qtgui/g/QGraphicsScene.cpp
* contrib/hbqt/qtgui/g/QGraphicsSimpleTextItem.cpp
* contrib/hbqt/qtgui/g/QGraphicsTextItem.cpp
* contrib/hbqt/qtgui/g/QWidget.cpp
* Regenerated.
* contrib/hbqt/qtgui/qth/QGraphicsEllipseItem.qth
* contrib/hbqt/qtgui/qth/QGraphicsLineItem.qth
* contrib/hbqt/qtgui/qth/QGraphicsPathItem.qth
* contrib/hbqt/qtgui/qth/QGraphicsPixmapItem.qth
* contrib/hbqt/qtgui/qth/QGraphicsPolygonItem.qth
* contrib/hbqt/qtgui/qth/QGraphicsRectItem.qth
* contrib/hbqt/qtgui/qth/QGraphicsScene.qth
* contrib/hbqt/qtgui/qth/QGraphicsSimpleTextItem.qth
* contrib/hbqt/qtgui/qth/QGraphicsSvgItem.qth
* contrib/hbqt/qtgui/qth/QGraphicsTextItem.qth
* contrib/hbqt/qtgui/qth/QWidget.qth
* contrib/hbqt/qtwebkit/g/hbqtwebkit.h
! Corrected constructors which were wrongly based
on p->HBQT_TYPE_Q*Class for certain situations.
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
method call is supplied to the constructor.
- contrib/hbqt/qtgui/hbqt_hbqgraphicsrectitem.cpp
- contrib/hbqt/qtgui/hbqt_hbqgraphicsrectitem.h
- Deleted sub-classes no longer required.
This commit is contained in:
@@ -16,6 +16,46 @@
|
||||
The license applies to all entries newer than 2009-04-28.
|
||||
*/
|
||||
|
||||
2010-09-15 14:35 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
|
||||
* contrib/hbqt/hbqt_hbmk2_plugin.hbs
|
||||
|
||||
* contrib/hbqt/qtgui/g/QGraphicsEllipseItem.cpp
|
||||
* contrib/hbqt/qtgui/g/QGraphicsLineItem.cpp
|
||||
* contrib/hbqt/qtgui/g/QGraphicsPathItem.cpp
|
||||
* contrib/hbqt/qtgui/g/QGraphicsPixmapItem.cpp
|
||||
* contrib/hbqt/qtgui/g/QGraphicsPolygonItem.cpp
|
||||
* contrib/hbqt/qtgui/g/QGraphicsRectItem.cpp
|
||||
* contrib/hbqt/qtgui/g/QGraphicsScene.cpp
|
||||
* contrib/hbqt/qtgui/g/QGraphicsSimpleTextItem.cpp
|
||||
* contrib/hbqt/qtgui/g/QGraphicsTextItem.cpp
|
||||
* contrib/hbqt/qtgui/g/QWidget.cpp
|
||||
* Regenerated.
|
||||
|
||||
* contrib/hbqt/qtgui/qth/QGraphicsEllipseItem.qth
|
||||
* contrib/hbqt/qtgui/qth/QGraphicsLineItem.qth
|
||||
* contrib/hbqt/qtgui/qth/QGraphicsPathItem.qth
|
||||
* contrib/hbqt/qtgui/qth/QGraphicsPixmapItem.qth
|
||||
* contrib/hbqt/qtgui/qth/QGraphicsPolygonItem.qth
|
||||
* contrib/hbqt/qtgui/qth/QGraphicsRectItem.qth
|
||||
* contrib/hbqt/qtgui/qth/QGraphicsScene.qth
|
||||
* contrib/hbqt/qtgui/qth/QGraphicsSimpleTextItem.qth
|
||||
* contrib/hbqt/qtgui/qth/QGraphicsSvgItem.qth
|
||||
* contrib/hbqt/qtgui/qth/QGraphicsTextItem.qth
|
||||
* contrib/hbqt/qtgui/qth/QWidget.qth
|
||||
* contrib/hbqt/qtwebkit/g/hbqtwebkit.h
|
||||
! Corrected constructors which were wrongly based
|
||||
on p->HBQT_TYPE_Q*Class for certain situations.
|
||||
|
||||
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
|
||||
method call is supplied to the constructor.
|
||||
|
||||
- contrib/hbqt/qtgui/hbqt_hbqgraphicsrectitem.cpp
|
||||
- contrib/hbqt/qtgui/hbqt_hbqgraphicsrectitem.h
|
||||
- Deleted sub-classes no longer required.
|
||||
|
||||
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
|
||||
|
||||
@@ -505,7 +505,7 @@ STATIC FUNCTION hbq_gen_ui_prg( cFile, cFuncName )
|
||||
hbq_stripFront( @cMCls, "(" )
|
||||
hbq_stripRear( @cMNam, ")" )
|
||||
|
||||
AAdd( aWidgets, { cMCls, cMNam, cMCls + "()", cMCls + "():new()" } )
|
||||
AAdd( aWidgets, { cMCls, cMNam, cMCls + "()", cMCls + "()" } )
|
||||
|
||||
/* Normalize */
|
||||
FOR EACH s IN aLines
|
||||
@@ -536,10 +536,10 @@ STATIC FUNCTION hbq_gen_ui_prg( cFile, cFuncName )
|
||||
s := AllTrim( StrTran( s, cCls, "",, 1 ) )
|
||||
IF ( n := At( "(", s ) ) > 0
|
||||
cNam := SubStr( s, 1, n - 1 )
|
||||
AAdd( aWidgets, { cCls, cNam, cCls + "()", cCls + "():new" + SubStr( s, n ) } )
|
||||
AAdd( aWidgets, { cCls, cNam, cCls + "()", cCls + SubStr( s, n ) } )
|
||||
ELSE
|
||||
cNam := s
|
||||
AAdd( aWidgets, { cCls, cNam, cCls + "()", cCls + "():new()" } )
|
||||
AAdd( aWidgets, { cCls, cNam, cCls + "()", cCls + "()" } )
|
||||
ENDIF
|
||||
|
||||
ELSEIF hbq_isObjectNameSet( s )
|
||||
@@ -591,7 +591,7 @@ STATIC FUNCTION hbq_gen_ui_prg( cFile, cFuncName )
|
||||
cCmd := hbq_setObjects( cCmd, aWidgets )
|
||||
n := At( "(", cCmd )
|
||||
cCls := SubStr( cCmd, 1, n - 1 )
|
||||
AAdd( aWidgets, { cCls, cNam, cCls + "()", cCls + "():new" + SubStr( cCmd, n ) } )
|
||||
AAdd( aWidgets, { cCls, cNam, cCls + "()", cCls + SubStr( cCmd, n ) } )
|
||||
|
||||
ENDIF
|
||||
ENDIF
|
||||
@@ -614,13 +614,13 @@ STATIC FUNCTION hbq_gen_ui_prg( cFile, cFuncName )
|
||||
|
||||
SWITCH cMCls
|
||||
CASE "QDialog"
|
||||
AAdd( aLinesPRG, " oWidget := QDialog():new( qParent )" )
|
||||
AAdd( aLinesPRG, " oWidget := QDialog( qParent )" )
|
||||
EXIT
|
||||
CASE "QWidget"
|
||||
AAdd( aLinesPRG, " oWidget := QWidget():new( qParent )" )
|
||||
AAdd( aLinesPRG, " oWidget := QWidget( qParent )" )
|
||||
EXIT
|
||||
CASE "QMainWindow"
|
||||
AAdd( aLinesPRG, " oWidget := QMainWindow():new( qParent )" )
|
||||
AAdd( aLinesPRG, " oWidget := QMainWindow( qParent )" )
|
||||
EXIT
|
||||
ENDSWITCH
|
||||
AAdd( aLinesPRG, " " )
|
||||
@@ -710,8 +710,8 @@ STATIC FUNCTION hbq_formatCommand( cCmd, lText, widgets )
|
||||
cCmd := StrTran( cCmd, "QApplication_translate" , "q__tr" )
|
||||
cCmd := StrTran( cCmd, "QApplication::UnicodeUTF8", '"UTF8"' )
|
||||
cCmd := StrTran( cCmd, "QString()" , '""' )
|
||||
cCmd := StrTran( cCmd, "QSize(" , "QSize():new(" )
|
||||
cCmd := StrTran( cCmd, "QRect(" , "QRect():new(" )
|
||||
cCmd := StrTran( cCmd, "QSize(" , "QSize(" )
|
||||
cCmd := StrTran( cCmd, "QRect(" , "QRect(" )
|
||||
|
||||
IF "::" $ cCmd
|
||||
regDefine := hb_regexComp( "\b[A-Za-z_]+\:\:[A-Za-z_]+\b" )
|
||||
@@ -730,7 +730,7 @@ STATIC FUNCTION hbq_formatCommand( cCmd, lText, widgets )
|
||||
n1 := At( ".", cCmd )
|
||||
cCmd1 := hbq_setObjects( SubStr( cCmd, n + 1, n1 - n - 1 ), widgets )
|
||||
cCmd1 := StrTran( cCmd1, "->", ":" )
|
||||
AAdd( widgets, { "QSizePolicy", cNam, "QSizePolicy()", "QSizePolicy():configure(" + cCmd1 + ")" } )
|
||||
AAdd( widgets, { "QSizePolicy", cNam, "QSizePolicy()", "QSizePolicy():from(" + cCmd1 + ")" } )
|
||||
cCmd := 'setHeightForWidth(o[ "' + cNam + '" ]:' + SubStr( cCmd, n1 + 1 )
|
||||
ELSE
|
||||
cCmd := "pPtr"
|
||||
|
||||
@@ -143,17 +143,13 @@ HB_FUNC( QT_QGRAPHICSELLIPSEITEM )
|
||||
else if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) )
|
||||
{
|
||||
HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
|
||||
if( p->type == HBQT_TYPE_QGraphicsItem )
|
||||
{
|
||||
pObj = new QGraphicsEllipseItem( hbqt_par_QGraphicsItem( 1 ) ) ;
|
||||
}
|
||||
else if( p->type == HBQT_TYPE_QRectF )
|
||||
if( p->type == HBQT_TYPE_QRectF )
|
||||
{
|
||||
pObj = new QGraphicsEllipseItem( *hbqt_par_QRectF( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) ;
|
||||
}
|
||||
else
|
||||
{
|
||||
pObj = new QGraphicsEllipseItem() ;
|
||||
pObj = new QGraphicsEllipseItem( hbqt_par_QGraphicsItem( 1 ) ) ;
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
@@ -144,17 +144,13 @@ HB_FUNC( QT_QGRAPHICSLINEITEM )
|
||||
else if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) )
|
||||
{
|
||||
HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
|
||||
if( p->type == HBQT_TYPE_QGraphicsItem )
|
||||
{
|
||||
pObj = new QGraphicsLineItem( hbqt_par_QGraphicsItem( 1 ) ) ;
|
||||
}
|
||||
else if( p->type == HBQT_TYPE_QLineF )
|
||||
if( p->type == HBQT_TYPE_QLineF )
|
||||
{
|
||||
pObj = new QGraphicsLineItem( *hbqt_par_QLineF( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) ;
|
||||
}
|
||||
else
|
||||
{
|
||||
pObj = new QGraphicsLineItem() ;
|
||||
pObj = new QGraphicsLineItem( hbqt_par_QGraphicsItem( 1 ) ) ;
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
@@ -138,17 +138,13 @@ HB_FUNC( QT_QGRAPHICSPATHITEM )
|
||||
if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) )
|
||||
{
|
||||
HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
|
||||
if( p->type == HBQT_TYPE_QGraphicsItem )
|
||||
{
|
||||
pObj = new QGraphicsPathItem( hbqt_par_QGraphicsItem( 1 ) ) ;
|
||||
}
|
||||
else if( p->type == HBQT_TYPE_QPainterPath )
|
||||
if( p->type == HBQT_TYPE_QPainterPath )
|
||||
{
|
||||
pObj = new QGraphicsPathItem( *hbqt_par_QPainterPath( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) ;
|
||||
}
|
||||
else
|
||||
{
|
||||
pObj = new QGraphicsPathItem() ;
|
||||
pObj = new QGraphicsPathItem( hbqt_par_QGraphicsItem( 1 ) ) ;
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
@@ -142,17 +142,13 @@ HB_FUNC( QT_QGRAPHICSPIXMAPITEM )
|
||||
if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) )
|
||||
{
|
||||
HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
|
||||
if( p->type == HBQT_TYPE_QGraphicsItem )
|
||||
{
|
||||
pObj = new QGraphicsPixmapItem( hbqt_par_QGraphicsItem( 1 ) ) ;
|
||||
}
|
||||
else if( p->type == HBQT_TYPE_QPixmap )
|
||||
if( p->type == HBQT_TYPE_QPixmap )
|
||||
{
|
||||
pObj = new QGraphicsPixmapItem( *hbqt_par_QPixmap( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) ;
|
||||
}
|
||||
else
|
||||
{
|
||||
pObj = new QGraphicsPixmapItem() ;
|
||||
pObj = new QGraphicsPixmapItem( hbqt_par_QGraphicsItem( 1 ) ) ;
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
@@ -138,17 +138,13 @@ HB_FUNC( QT_QGRAPHICSPOLYGONITEM )
|
||||
if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) )
|
||||
{
|
||||
HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
|
||||
if( p->type == HBQT_TYPE_QGraphicsItem )
|
||||
{
|
||||
pObj = new QGraphicsPolygonItem( hbqt_par_QGraphicsItem( 1 ) ) ;
|
||||
}
|
||||
else if( p->type == HBQT_TYPE_QPolygonF )
|
||||
if( p->type == HBQT_TYPE_QPolygonF )
|
||||
{
|
||||
pObj = new QGraphicsPolygonItem( *hbqt_par_QPolygonF( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) ;
|
||||
}
|
||||
else
|
||||
{
|
||||
pObj = new QGraphicsPolygonItem() ;
|
||||
pObj = new QGraphicsPolygonItem( hbqt_par_QGraphicsItem( 1 ) ) ;
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
@@ -143,17 +143,13 @@ HB_FUNC( QT_QGRAPHICSRECTITEM )
|
||||
else if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) )
|
||||
{
|
||||
HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
|
||||
if( p->type == HBQT_TYPE_QGraphicsItem )
|
||||
{
|
||||
pObj = new QGraphicsRectItem( hbqt_par_QGraphicsItem( 1 ) ) ;
|
||||
}
|
||||
else if( p->type == HBQT_TYPE_QRectF )
|
||||
if( p->type == HBQT_TYPE_QRectF )
|
||||
{
|
||||
pObj = new QGraphicsRectItem( *hbqt_par_QRectF( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) ;
|
||||
}
|
||||
else
|
||||
{
|
||||
pObj = new QGraphicsRectItem() ;
|
||||
pObj = new QGraphicsRectItem( hbqt_par_QGraphicsItem( 1 ) ) ;
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
@@ -174,17 +174,13 @@ HB_FUNC( QT_QGRAPHICSSCENE )
|
||||
else if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) )
|
||||
{
|
||||
HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
|
||||
if( p->type == HBQT_TYPE_QObject )
|
||||
{
|
||||
pObj = new QGraphicsScene( hbqt_par_QObject( 1 ) ) ;
|
||||
}
|
||||
else if( p->type == HBQT_TYPE_QRectF )
|
||||
if( p->type == HBQT_TYPE_QRectF )
|
||||
{
|
||||
pObj = new QGraphicsScene( *hbqt_par_QRectF( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QObject( 2 ) : 0 ) ) ;
|
||||
}
|
||||
else
|
||||
{
|
||||
pObj = new QGraphicsScene() ;
|
||||
pObj = new QGraphicsScene( hbqt_par_QObject( 1 ) ) ;
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
@@ -144,15 +144,7 @@ HB_FUNC( QT_QGRAPHICSSIMPLETEXTITEM )
|
||||
}
|
||||
else if( HB_ISPOINTER( 1 ) )
|
||||
{
|
||||
HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
|
||||
if( p->type == HBQT_TYPE_QGraphicsItem )
|
||||
{
|
||||
pObj = new QGraphicsSimpleTextItem( hbqt_par_QGraphicsItem( 1 ) ) ;
|
||||
}
|
||||
else
|
||||
{
|
||||
pObj = new QGraphicsSimpleTextItem() ;
|
||||
}
|
||||
pObj = new QGraphicsSimpleTextItem( hbqt_par_QGraphicsItem( 1 ) ) ;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -157,15 +157,7 @@ HB_FUNC( QT_QGRAPHICSTEXTITEM )
|
||||
}
|
||||
else if( HB_ISPOINTER( 1 ) )
|
||||
{
|
||||
HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
|
||||
if( p->type == HBQT_TYPE_QGraphicsItem )
|
||||
{
|
||||
pObj = new QGraphicsTextItem( hbqt_par_QGraphicsItem( 1 ) ) ;
|
||||
}
|
||||
else
|
||||
{
|
||||
pObj = new QGraphicsTextItem() ;
|
||||
}
|
||||
pObj = new QGraphicsTextItem( hbqt_par_QGraphicsItem( 1 ) ) ;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -189,7 +189,14 @@ HB_FUNC( QT_QWIDGET )
|
||||
{
|
||||
QWidget * pObj = NULL;
|
||||
|
||||
pObj = new QWidget( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ;
|
||||
if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) )
|
||||
{
|
||||
pObj = new QWidget( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : 0 ) ) ;
|
||||
}
|
||||
else
|
||||
{
|
||||
pObj = new QWidget() ;
|
||||
}
|
||||
|
||||
hb_retptrGC( hbqt_gcAllocate_QWidget( ( void * ) pObj, true ) );
|
||||
}
|
||||
|
||||
@@ -1,334 +0,0 @@
|
||||
/*
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
/*
|
||||
* Harbour Project source code:
|
||||
* QT wrapper main header
|
||||
*
|
||||
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
|
||||
* www - http://harbour-project.org
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2, or (at your option)
|
||||
* any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this software; see the file COPYING. If not, write to
|
||||
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
||||
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
|
||||
*
|
||||
* As a special exception, the Harbour Project gives permission for
|
||||
* additional uses of the text contained in its release of Harbour.
|
||||
*
|
||||
* The exception is that, if you link the Harbour libraries with other
|
||||
* files to produce an executable, this does not by itself cause the
|
||||
* resulting executable to be covered by the GNU General Public License.
|
||||
* Your use of that executable is in no way restricted on account of
|
||||
* linking the Harbour library code into it.
|
||||
*
|
||||
* This exception does not however invalidate any other reasons why
|
||||
* the executable file might be covered by the GNU General Public License.
|
||||
*
|
||||
* This exception applies only to the code released by the Harbour
|
||||
* Project under the name Harbour. If you copy code from other
|
||||
* Harbour Project or Free Software Foundation releases into a copy of
|
||||
* Harbour, as the General Public License permits, the exception does
|
||||
* not apply to the code that you add in this way. To avoid misleading
|
||||
* anyone as to the status of such modified files, you must delete
|
||||
* this exception notice from them.
|
||||
*
|
||||
* If you write modifications of your own for Harbour, it is your choice
|
||||
* whether to permit this exception to apply to your modifications.
|
||||
* If you do not wish that, delete this exception notice.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "hbqt.h"
|
||||
#include "hbapiitm.h"
|
||||
#include "hbvm.h"
|
||||
|
||||
#if QT_VERSION >= 0x040500
|
||||
|
||||
#include "hbqt_hbqgraphicsrectitem.h"
|
||||
|
||||
HBQGraphicsRectItem::HBQGraphicsRectItem( QGraphicsItem * parent ) : QGraphicsRectItem( parent )
|
||||
{
|
||||
block = NULL;
|
||||
resizeMode = RESIZE_MODE_NONE;
|
||||
}
|
||||
|
||||
HBQGraphicsRectItem::HBQGraphicsRectItem( const QRectF & rect, QGraphicsItem * parent ) : QGraphicsRectItem( rect, parent )
|
||||
{
|
||||
block = NULL;
|
||||
resizeMode = RESIZE_MODE_NONE;
|
||||
}
|
||||
|
||||
HBQGraphicsRectItem::HBQGraphicsRectItem( qreal x, qreal y, qreal width, qreal height, QGraphicsItem * parent ) : QGraphicsRectItem( x, y, width, height, parent )
|
||||
{
|
||||
block = NULL;
|
||||
resizeMode = RESIZE_MODE_NONE;
|
||||
}
|
||||
|
||||
HBQGraphicsRectItem::~HBQGraphicsRectItem()
|
||||
{
|
||||
if( block )
|
||||
{
|
||||
hb_itemRelease( block );
|
||||
block = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
void HBQGraphicsRectItem::hbSetBlock( PHB_ITEM b )
|
||||
{
|
||||
if( b )
|
||||
{
|
||||
block = hb_itemNew( b );
|
||||
|
||||
QDesktopWidget * qWid = new QDesktopWidget();
|
||||
|
||||
PHB_ITEM p1 = hb_itemPutNI( NULL, 21001 );
|
||||
PHB_ITEM p2 = hb_itemPutNI( NULL, qWid->screen()->physicalDpiX() );
|
||||
PHB_ITEM p3 = hb_itemPutNI( NULL, qWid->screen()->physicalDpiY() );
|
||||
hb_vmEvalBlockV( block, 3, p1, p2, p3 );
|
||||
hb_itemRelease( p1 );
|
||||
hb_itemRelease( p2 );
|
||||
hb_itemRelease( p3 );
|
||||
}
|
||||
}
|
||||
|
||||
void HBQGraphicsRectItem::dragEnterEvent( QGraphicsSceneDragDropEvent * event )
|
||||
{
|
||||
if( block )
|
||||
{
|
||||
PHB_ITEM p1 = hb_itemPutNI( NULL, ( int ) QEvent::GraphicsSceneDragEnter );
|
||||
PHB_ITEM p2 = hb_itemPutPtr( NULL, event );
|
||||
hb_vmEvalBlockV( block, 2, p1, p2 );
|
||||
hb_itemRelease( p1 );
|
||||
hb_itemRelease( p2 );
|
||||
}
|
||||
QGraphicsItem::dragEnterEvent( event );
|
||||
}
|
||||
void HBQGraphicsRectItem::dragLeaveEvent( QGraphicsSceneDragDropEvent * event )
|
||||
{
|
||||
if( block )
|
||||
{
|
||||
PHB_ITEM p1 = hb_itemPutNI( NULL, ( int ) QEvent::GraphicsSceneDragLeave );
|
||||
PHB_ITEM p2 = hb_itemPutPtr( NULL, event );
|
||||
hb_vmEvalBlockV( block, 2, p1, p2 );
|
||||
hb_itemRelease( p1 );
|
||||
hb_itemRelease( p2 );
|
||||
}
|
||||
QGraphicsItem::dragLeaveEvent( event );
|
||||
}
|
||||
void HBQGraphicsRectItem::dragMoveEvent( QGraphicsSceneDragDropEvent * event )
|
||||
{
|
||||
if( block )
|
||||
{
|
||||
PHB_ITEM p1 = hb_itemPutNI( NULL, ( int ) QEvent::GraphicsSceneDragMove );
|
||||
PHB_ITEM p2 = hb_itemPutPtr( NULL, event );
|
||||
hb_vmEvalBlockV( block, 2, p1, p2 );
|
||||
hb_itemRelease( p1 );
|
||||
hb_itemRelease( p2 );
|
||||
}
|
||||
QGraphicsItem::dragMoveEvent( event );
|
||||
}
|
||||
void HBQGraphicsRectItem::dropEvent( QGraphicsSceneDragDropEvent * event )
|
||||
{
|
||||
if( block )
|
||||
{
|
||||
const QMimeData * mime = event->mimeData();
|
||||
|
||||
if( mime->hasFormat( ( QString ) "application/x-qabstractitemmodeldatalist" ) )
|
||||
{
|
||||
PHB_ITEM p1 = hb_itemPutNI( NULL, ( int ) QEvent::GraphicsSceneDrop );
|
||||
PHB_ITEM p2 = hb_itemPutPtr( NULL, event );
|
||||
PHB_ITEM p3 = hb_itemNew( NULL );
|
||||
|
||||
QTreeWidget * tree = dynamic_cast< QTreeWidget * >( event->source() );
|
||||
|
||||
QByteArray encoded = mime->data( "application/x-qabstractitemmodeldatalist" );
|
||||
QDataStream stream( &encoded, QIODevice::ReadOnly );
|
||||
|
||||
int row, col;
|
||||
QMap< int, QVariant > roleDataMap;
|
||||
stream >> row >> col >> roleDataMap;
|
||||
|
||||
QTreeWidgetItem * item = tree->topLevelItem( row );
|
||||
|
||||
hb_arrayNew( p3, 3 );
|
||||
//
|
||||
hb_arraySetC( p3, 1, tree->objectName().toLatin1().data() );
|
||||
hb_arraySetC( p3, 2, roleDataMap.value( Qt::DisplayRole ).toString().toLatin1().data() );
|
||||
hb_arraySetC( p3, 3, item->text( 0 ).toLatin1().data() );
|
||||
//
|
||||
hb_vmEvalBlockV( block, 3, p1, p2, p3 );
|
||||
//
|
||||
hb_itemRelease( p1 );
|
||||
hb_itemRelease( p2 );
|
||||
hb_itemRelease( p3 );
|
||||
}
|
||||
else
|
||||
{
|
||||
PHB_ITEM p1 = hb_itemPutNI( NULL, ( int ) QEvent::GraphicsSceneDrop );
|
||||
PHB_ITEM p2 = hb_itemPutPtr( NULL, event );
|
||||
hb_vmEvalBlockV( block, 2, p1, p2 );
|
||||
hb_itemRelease( p1 );
|
||||
hb_itemRelease( p2 );
|
||||
}
|
||||
}
|
||||
QGraphicsItem::dropEvent( event );
|
||||
}
|
||||
|
||||
void HBQGraphicsRectItem::mousePressEvent( QGraphicsSceneMouseEvent * event )
|
||||
{
|
||||
oGeometry = geometry();
|
||||
|
||||
foreach( QGraphicsItem * item, scene()->items() )
|
||||
{
|
||||
if( item->zValue() == 1 ){
|
||||
item->setZValue( 0 );
|
||||
}
|
||||
}
|
||||
setZValue( 1 );
|
||||
|
||||
if( event->buttons() == Qt::LeftButton ){
|
||||
resizeMode = determineResizeMode( event->pos() );
|
||||
}
|
||||
else {
|
||||
resizeMode = RESIZE_MODE_NONE;
|
||||
}
|
||||
|
||||
if( resizeMode == RESIZE_MODE_NONE ){
|
||||
setCursor( QCursor( Qt::ClosedHandCursor ) );
|
||||
}
|
||||
|
||||
QGraphicsItem::mousePressEvent( event );
|
||||
|
||||
if( event->buttons() == Qt::LeftButton ){
|
||||
// emit( itemSelected( this, event->pos() ) );
|
||||
}
|
||||
}
|
||||
|
||||
void HBQGraphicsRectItem::mouseReleaseEvent( QGraphicsSceneMouseEvent * event )
|
||||
{
|
||||
QGraphicsItem::mouseReleaseEvent( event );
|
||||
resizeMode = RESIZE_MODE_NONE;
|
||||
|
||||
QRectF nGeometry = geometry();
|
||||
if( nGeometry != oGeometry ){
|
||||
// emit( geometryChanged( this, nGeometry, oGeometry ) );
|
||||
}
|
||||
}
|
||||
|
||||
void HBQGraphicsRectItem::mouseMoveEvent( QGraphicsSceneMouseEvent * event )
|
||||
{
|
||||
if( event->buttons() == Qt::LeftButton )
|
||||
{
|
||||
if( resizeMode == RESIZE_MODE_NONE ){
|
||||
setPos( pos() + QPoint( ( int ) ( event->scenePos().x() - event->lastScenePos().x() ),
|
||||
( int ) ( event->scenePos().y() - event->lastScenePos().y() ) ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
if( resizeMode & RESIZE_MODE_LEFT ){
|
||||
setPos( pos().x() + event->scenePos().x() - event->lastScenePos().x(), pos().y() );
|
||||
setWidth( width() + event->lastScenePos().x() - event->scenePos().x() );
|
||||
}
|
||||
if( resizeMode & RESIZE_MODE_TOP ){
|
||||
setPos( pos().x(), pos().y() + event->scenePos().y() - event->lastScenePos().y() );
|
||||
setHeight( height() + event->lastScenePos().y() - event->scenePos().y() );
|
||||
}
|
||||
if( resizeMode & RESIZE_MODE_RIGHT ){
|
||||
setWidth( ( int ) ( width() + event->scenePos().x() - event->lastScenePos().x() ) );
|
||||
}
|
||||
if( resizeMode & RESIZE_MODE_BOTTOM ){
|
||||
setHeight( ( int ) ( height() + event->scenePos().y() - event->lastScenePos().y() ) );
|
||||
}
|
||||
if( width() < 5 ){
|
||||
setWidth( 5 );
|
||||
}
|
||||
if( height() < 5 ){
|
||||
setHeight( 5 );
|
||||
}
|
||||
}
|
||||
}
|
||||
QGraphicsItem::mouseMoveEvent( event );
|
||||
}
|
||||
|
||||
void HBQGraphicsRectItem::hoverEnterEvent( QGraphicsSceneHoverEvent * event )
|
||||
{
|
||||
HB_TRACE( HB_TR_ALWAYS, ( "hoverEnter" ) );
|
||||
determineResizeMode( event->pos() );
|
||||
QGraphicsItem::hoverEnterEvent( event );
|
||||
}
|
||||
|
||||
int HBQGraphicsRectItem::determineResizeMode( const QPointF & pos )
|
||||
{
|
||||
int resizeModes = RESIZE_MODE_LEFT | RESIZE_MODE_TOP | RESIZE_MODE_RIGHT | RESIZE_MODE_BOTTOM ;
|
||||
int mode = RESIZE_MODE_NONE;
|
||||
|
||||
QRectF topRect( 0, 0, width(), 2 );
|
||||
QRectF leftRect( 0, 0, 2, height() );
|
||||
QRectF bottomRect( 0, height() - 2, width(), 2 );
|
||||
QRectF rightRect( width() - 2, 0, width(), height() );
|
||||
|
||||
if( resizeModes & RESIZE_MODE_LEFT && leftRect.contains( pos ) ){
|
||||
mode |= RESIZE_MODE_LEFT;
|
||||
setCursor( QCursor( Qt::SizeHorCursor ) );
|
||||
}
|
||||
if( resizeModes & RESIZE_MODE_TOP && topRect.contains( pos ) ){
|
||||
mode |= RESIZE_MODE_TOP;
|
||||
}
|
||||
if( resizeModes & RESIZE_MODE_RIGHT && rightRect.contains( pos ) ){
|
||||
mode |= RESIZE_MODE_RIGHT;
|
||||
}
|
||||
if( resizeModes & RESIZE_MODE_BOTTOM && bottomRect.contains( pos ) ){
|
||||
mode |= RESIZE_MODE_BOTTOM;
|
||||
}
|
||||
return mode;
|
||||
}
|
||||
|
||||
QRectF HBQGraphicsRectItem::geometry()
|
||||
{
|
||||
return QRectF( pos().x(), pos().y(), width(), height() );
|
||||
}
|
||||
|
||||
void HBQGraphicsRectItem::setGeometry( const QRectF & rect )
|
||||
{
|
||||
setPos( rect.x(), rect.y() );
|
||||
setWidth( rect.width() );
|
||||
setHeight( rect.height() );
|
||||
}
|
||||
|
||||
void HBQGraphicsRectItem::setWidth( qreal width )
|
||||
{
|
||||
// prepareGeometryChange();
|
||||
iWidth = width;
|
||||
//emit( geometryChanged( geometry() ) );
|
||||
}
|
||||
|
||||
void HBQGraphicsRectItem::setHeight( qreal height )
|
||||
{
|
||||
// prepareGeometryChange();
|
||||
iHeight = height;
|
||||
//emit( geometryChanged( geometry() ) );
|
||||
}
|
||||
|
||||
qreal HBQGraphicsRectItem::width() const
|
||||
{
|
||||
return iWidth;
|
||||
}
|
||||
|
||||
qreal HBQGraphicsRectItem::height() const
|
||||
{
|
||||
return iHeight;
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -1,115 +0,0 @@
|
||||
/*
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
/*
|
||||
* Harbour Project source code:
|
||||
* QT wrapper main header
|
||||
*
|
||||
* Copyright 2009-2010 Pritpal Bedi <bedipritpal@hotmail.com>
|
||||
* www - http://harbour-project.org
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2, or (at your option)
|
||||
* any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this software; see the file COPYING. If not, write to
|
||||
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
||||
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
|
||||
*
|
||||
* As a special exception, the Harbour Project gives permission for
|
||||
* additional uses of the text contained in its release of Harbour.
|
||||
*
|
||||
* The exception is that, if you link the Harbour libraries with other
|
||||
* files to produce an executable, this does not by itself cause the
|
||||
* resulting executable to be covered by the GNU General Public License.
|
||||
* Your use of that executable is in no way restricted on account of
|
||||
* linking the Harbour library code into it.
|
||||
*
|
||||
* This exception does not however invalidate any other reasons why
|
||||
* the executable file might be covered by the GNU General Public License.
|
||||
*
|
||||
* This exception applies only to the code released by the Harbour
|
||||
* Project under the name Harbour. If you copy code from other
|
||||
* Harbour Project or Free Software Foundation releases into a copy of
|
||||
* Harbour, as the General Public License permits, the exception does
|
||||
* not apply to the code that you add in this way. To avoid misleading
|
||||
* anyone as to the status of such modified files, you must delete
|
||||
* this exception notice from them.
|
||||
*
|
||||
* If you write modifications of your own for Harbour, it is your choice
|
||||
* whether to permit this exception to apply to your modifications.
|
||||
* If you do not wish that, delete this exception notice.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef HBQT_HBQGRAPHICSRECTITEM_H
|
||||
#define HBQT_HBQGRAPHICSRECTITEM_H
|
||||
|
||||
#include "hbqtgui.h"
|
||||
|
||||
#include <QtGui/QGraphicsRectItem>
|
||||
#include <QtGui/QGraphicsScene>
|
||||
#include <QtGui/QGraphicsSceneDragDropEvent>
|
||||
#include <QtGui/QTreeWidget>
|
||||
#include <QtGui/QDesktopWidget>
|
||||
#include <QtCore/QModelIndex>
|
||||
#include <QtCore/QEvent>
|
||||
#include <QtCore/QMimeData>
|
||||
|
||||
#define RESIZE_MODE_NONE 0
|
||||
#define RESIZE_MODE_LEFT 1
|
||||
#define RESIZE_MODE_TOP 2
|
||||
#define RESIZE_MODE_RIGHT 4
|
||||
#define RESIZE_MODE_BOTTOM 8
|
||||
|
||||
class HBQGraphicsRectItem : public QGraphicsRectItem
|
||||
{
|
||||
|
||||
public:
|
||||
HBQGraphicsRectItem( QGraphicsItem * parent = 0 );
|
||||
HBQGraphicsRectItem( const QRectF & rect, QGraphicsItem * parent = 0 );
|
||||
HBQGraphicsRectItem( qreal x, qreal y, qreal width, qreal height, QGraphicsItem * parent = 0 );
|
||||
~HBQGraphicsRectItem();
|
||||
|
||||
PHB_ITEM block;
|
||||
int determineResizeMode( const QPointF & pos );
|
||||
|
||||
private:
|
||||
bool bYes;
|
||||
int resizeMode;
|
||||
QRectF oGeometry;
|
||||
qreal iWidth;
|
||||
qreal iHeight;
|
||||
|
||||
protected:
|
||||
void dragEnterEvent( QGraphicsSceneDragDropEvent * event );
|
||||
void dragLeaveEvent( QGraphicsSceneDragDropEvent * event );
|
||||
void dragMoveEvent( QGraphicsSceneDragDropEvent * event );
|
||||
void dropEvent( QGraphicsSceneDragDropEvent * event );
|
||||
//
|
||||
void mousePressEvent( QGraphicsSceneMouseEvent * event );
|
||||
void mouseReleaseEvent( QGraphicsSceneMouseEvent * event );
|
||||
void mouseMoveEvent( QGraphicsSceneMouseEvent * event );
|
||||
|
||||
void hoverEnterEvent( QGraphicsSceneHoverEvent * event );
|
||||
|
||||
public slots:
|
||||
void hbSetBlock( PHB_ITEM block );
|
||||
QRectF geometry();
|
||||
void setGeometry( const QRectF & rect );
|
||||
qreal width() const;
|
||||
void setWidth( qreal width );
|
||||
qreal height() const;
|
||||
void setHeight( qreal height );
|
||||
|
||||
};
|
||||
|
||||
#endif
|
||||
@@ -80,17 +80,13 @@ HB_FUNC( QT_QGRAPHICSELLIPSEITEM )
|
||||
else if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) )
|
||||
{
|
||||
HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
|
||||
if( p->type == HBQT_TYPE_QGraphicsItem )
|
||||
{
|
||||
hb_retptr( new QGraphicsEllipseItem( hbqt_par_QGraphicsItem( 1 ) ) );
|
||||
}
|
||||
else if( p->type == HBQT_TYPE_QRectF )
|
||||
if( p->type == HBQT_TYPE_QRectF )
|
||||
{
|
||||
hb_retptr( new QGraphicsEllipseItem( *hbqt_par_QRectF( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
hb_retptr( new QGraphicsEllipseItem() );
|
||||
hb_retptr( new QGraphicsEllipseItem( hbqt_par_QGraphicsItem( 1 ) ) );
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
@@ -81,17 +81,13 @@ HB_FUNC( QT_QGRAPHICSLINEITEM )
|
||||
else if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) )
|
||||
{
|
||||
HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
|
||||
if( p->type == HBQT_TYPE_QGraphicsItem )
|
||||
{
|
||||
hb_retptr( new QGraphicsLineItem( hbqt_par_QGraphicsItem( 1 ) ) );
|
||||
}
|
||||
else if( p->type == HBQT_TYPE_QLineF )
|
||||
if( p->type == HBQT_TYPE_QLineF )
|
||||
{
|
||||
hb_retptr( new QGraphicsLineItem( *hbqt_par_QLineF( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
hb_retptr( new QGraphicsLineItem() );
|
||||
hb_retptr( new QGraphicsLineItem( hbqt_par_QGraphicsItem( 1 ) ) );
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
@@ -75,17 +75,13 @@ HB_FUNC( QT_QGRAPHICSPATHITEM )
|
||||
if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) )
|
||||
{
|
||||
HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
|
||||
if( p->type == HBQT_TYPE_QGraphicsItem )
|
||||
{
|
||||
hb_retptr( new QGraphicsPathItem( hbqt_par_QGraphicsItem( 1 ) ) );
|
||||
}
|
||||
else if( p->type == HBQT_TYPE_QPainterPath )
|
||||
if( p->type == HBQT_TYPE_QPainterPath )
|
||||
{
|
||||
hb_retptr( new QGraphicsPathItem( *hbqt_par_QPainterPath( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
hb_retptr( new QGraphicsPathItem() );
|
||||
hb_retptr( new QGraphicsPathItem( hbqt_par_QGraphicsItem( 1 ) ) );
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
@@ -75,17 +75,13 @@ HB_FUNC( QT_QGRAPHICSPIXMAPITEM )
|
||||
if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) )
|
||||
{
|
||||
HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
|
||||
if( p->type == HBQT_TYPE_QGraphicsItem )
|
||||
{
|
||||
hb_retptr( new QGraphicsPixmapItem( hbqt_par_QGraphicsItem( 1 ) ) );
|
||||
}
|
||||
else if( p->type == HBQT_TYPE_QPixmap )
|
||||
if( p->type == HBQT_TYPE_QPixmap )
|
||||
{
|
||||
hb_retptr( new QGraphicsPixmapItem( *hbqt_par_QPixmap( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
hb_retptr( new QGraphicsPixmapItem() );
|
||||
hb_retptr( new QGraphicsPixmapItem( hbqt_par_QGraphicsItem( 1 ) ) );
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
@@ -75,17 +75,13 @@ HB_FUNC( QT_QGRAPHICSPOLYGONITEM )
|
||||
if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) )
|
||||
{
|
||||
HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
|
||||
if( p->type == HBQT_TYPE_QGraphicsItem )
|
||||
{
|
||||
hb_retptr( new QGraphicsPolygonItem( hbqt_par_QGraphicsItem( 1 ) ) );
|
||||
}
|
||||
else if( p->type == HBQT_TYPE_QPolygonF )
|
||||
if( p->type == HBQT_TYPE_QPolygonF )
|
||||
{
|
||||
hb_retptr( new QGraphicsPolygonItem( *hbqt_par_QPolygonF( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
hb_retptr( new QGraphicsPolygonItem() );
|
||||
hb_retptr( new QGraphicsPolygonItem( hbqt_par_QGraphicsItem( 1 ) ) );
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
@@ -80,17 +80,13 @@ HB_FUNC( QT_QGRAPHICSRECTITEM )
|
||||
else if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) )
|
||||
{
|
||||
HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
|
||||
if( p->type == HBQT_TYPE_QGraphicsItem )
|
||||
{
|
||||
hb_retptr( new QGraphicsRectItem( hbqt_par_QGraphicsItem( 1 ) ) );
|
||||
}
|
||||
else if( p->type == HBQT_TYPE_QRectF )
|
||||
if( p->type == HBQT_TYPE_QRectF )
|
||||
{
|
||||
hb_retptr( new QGraphicsRectItem( *hbqt_par_QRectF( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
hb_retptr( new QGraphicsRectItem() );
|
||||
hb_retptr( new QGraphicsRectItem( hbqt_par_QGraphicsItem( 1 ) ) );
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
@@ -80,17 +80,13 @@ HB_FUNC( QT_QGRAPHICSSCENE )
|
||||
else if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) )
|
||||
{
|
||||
HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
|
||||
if( p->type == HBQT_TYPE_QObject )
|
||||
{
|
||||
hb_retptr( new QGraphicsScene( hbqt_par_QObject( 1 ) ) );
|
||||
}
|
||||
else if( p->type == HBQT_TYPE_QRectF )
|
||||
if( p->type == HBQT_TYPE_QRectF )
|
||||
{
|
||||
hb_retptr( new QGraphicsScene( *hbqt_par_QRectF( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QObject( 2 ) : 0 ) ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
hb_retptr( new QGraphicsScene() );
|
||||
hb_retptr( new QGraphicsScene( hbqt_par_QObject( 1 ) ) );
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
@@ -81,15 +81,7 @@ HB_FUNC( QT_QGRAPHICSSIMPLETEXTITEM )
|
||||
}
|
||||
else if( HB_ISPOINTER( 1 ) )
|
||||
{
|
||||
HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
|
||||
if( p->type == HBQT_TYPE_QGraphicsItem )
|
||||
{
|
||||
hb_retptr( new QGraphicsSimpleTextItem( hbqt_par_QGraphicsItem( 1 ) ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
hb_retptr( new QGraphicsSimpleTextItem() );
|
||||
}
|
||||
hb_retptr( new QGraphicsSimpleTextItem( hbqt_par_QGraphicsItem( 1 ) ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -79,15 +79,7 @@ HB_FUNC( QT_QGRAPHICSSVGITEM )
|
||||
}
|
||||
else if( HB_ISPOINTER( 1 ) )
|
||||
{
|
||||
HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
|
||||
if( p->type == HBQT_TYPE_QGraphicsItem )
|
||||
{
|
||||
hb_retptr( new QGraphicsSvgItem( hbqt_par_QGraphicsItem( 1 ) ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
hb_retptr( new QGraphicsSvgItem() );
|
||||
}
|
||||
hb_retptr( new QGraphicsSvgItem( hbqt_par_QGraphicsItem( 1 ) ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -83,15 +83,7 @@ HB_FUNC( QT_QGRAPHICSTEXTITEM )
|
||||
}
|
||||
else if( HB_ISPOINTER( 1 ) )
|
||||
{
|
||||
HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
|
||||
if( p->type == HBQT_TYPE_QGraphicsItem )
|
||||
{
|
||||
hb_retptr( new QGraphicsTextItem( hbqt_par_QGraphicsItem( 1 ) ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
hb_retptr( new QGraphicsTextItem() );
|
||||
}
|
||||
hb_retptr( new QGraphicsTextItem( hbqt_par_QGraphicsItem( 1 ) ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -72,7 +72,14 @@ New = pParent, nFlags
|
||||
*/
|
||||
HB_FUNC( QT_QWIDGET )
|
||||
{
|
||||
hb_retptr( new QWidget( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) );
|
||||
if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) )
|
||||
{
|
||||
hb_retptr( new QWidget( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : 0 ) ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
hb_retptr( new QWidget() );
|
||||
}
|
||||
}
|
||||
</CODE>
|
||||
|
||||
|
||||
@@ -1,64 +1,64 @@
|
||||
/*
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/* WARNING: Automatically generated source file. DO NOT EDIT! */
|
||||
/* Instead, edit corresponding .qth file, */
|
||||
/* or the generator tool itself, and run regenarate. */
|
||||
/* -------------------------------------------------------------------- */
|
||||
|
||||
#ifndef __HBQTWEBKIT_H
|
||||
#define __HBQTWEBKIT_H
|
||||
|
||||
#include "hbqt.h"
|
||||
|
||||
HB_EXTERN_BEGIN
|
||||
|
||||
extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebFrame );
|
||||
extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebHistory );
|
||||
extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebHistoryInterface );
|
||||
extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebHistoryItem );
|
||||
extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebHitTestResult );
|
||||
extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebPage );
|
||||
extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebPluginFactory );
|
||||
extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebSecurityOrigin );
|
||||
extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebSettings );
|
||||
extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebView );
|
||||
|
||||
extern HB_EXPORT void * hbqt_gcAllocate_QWebFrame( void * pObj, bool bNew );
|
||||
extern HB_EXPORT void * hbqt_gcAllocate_QWebHistory( void * pObj, bool bNew );
|
||||
extern HB_EXPORT void * hbqt_gcAllocate_QWebHistoryInterface( void * pObj, bool bNew );
|
||||
extern HB_EXPORT void * hbqt_gcAllocate_QWebHistoryItem( void * pObj, bool bNew );
|
||||
extern HB_EXPORT void * hbqt_gcAllocate_QWebHitTestResult( void * pObj, bool bNew );
|
||||
extern HB_EXPORT void * hbqt_gcAllocate_QWebPage( void * pObj, bool bNew );
|
||||
extern HB_EXPORT void * hbqt_gcAllocate_QWebPluginFactory( void * pObj, bool bNew );
|
||||
extern HB_EXPORT void * hbqt_gcAllocate_QWebSecurityOrigin( void * pObj, bool bNew );
|
||||
extern HB_EXPORT void * hbqt_gcAllocate_QWebSettings( void * pObj, bool bNew );
|
||||
extern HB_EXPORT void * hbqt_gcAllocate_QWebView( void * pObj, bool bNew );
|
||||
|
||||
HB_EXTERN_END
|
||||
|
||||
#define hbqt_par_QWebFrame( n ) ( ( QWebFrame * ) hbqt_gcpointer( n ) )
|
||||
#define hbqt_par_QWebHistory( n ) ( ( QWebHistory * ) hbqt_gcpointer( n ) )
|
||||
#define hbqt_par_QWebHistoryInterface( n ) ( ( QWebHistoryInterface * ) hbqt_gcpointer( n ) )
|
||||
#define hbqt_par_QWebHistoryItem( n ) ( ( QWebHistoryItem * ) hbqt_gcpointer( n ) )
|
||||
#define hbqt_par_QWebHitTestResult( n ) ( ( QWebHitTestResult * ) hbqt_gcpointer( n ) )
|
||||
#define hbqt_par_QWebPage( n ) ( ( QWebPage * ) hbqt_gcpointer( n ) )
|
||||
#define hbqt_par_QWebPluginFactory( n ) ( ( QWebPluginFactory * ) hbqt_gcpointer( n ) )
|
||||
#define hbqt_par_QWebSecurityOrigin( n ) ( ( QWebSecurityOrigin * ) hbqt_gcpointer( n ) )
|
||||
#define hbqt_par_QWebSettings( n ) ( ( QWebSettings * ) hbqt_gcpointer( n ) )
|
||||
#define hbqt_par_QWebView( n ) ( ( QWebView * ) hbqt_gcpointer( n ) )
|
||||
|
||||
#define HBQT_TYPE_QWebFrame 0xC549CCEE
|
||||
#define HBQT_TYPE_QWebHistory 0x24AE8587
|
||||
#define HBQT_TYPE_QWebHistoryInterface 0x24436755
|
||||
#define HBQT_TYPE_QWebHistoryItem 0x24DEA87F
|
||||
#define HBQT_TYPE_QWebHitTestResult 0xA2B0A23E
|
||||
#define HBQT_TYPE_QWebPage 0xCF0E1A25
|
||||
#define HBQT_TYPE_QWebPluginFactory 0x8313F829
|
||||
#define HBQT_TYPE_QWebSecurityOrigin 0x76EEBFE7
|
||||
#define HBQT_TYPE_QWebSettings 0x77943AAB
|
||||
#define HBQT_TYPE_QWebView 0x25F9078B
|
||||
|
||||
#endif /* __HBQTWEBKIT_H */
|
||||
/*
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/* WARNING: Automatically generated source file. DO NOT EDIT! */
|
||||
/* Instead, edit corresponding .qth file, */
|
||||
/* or the generator tool itself, and run regenarate. */
|
||||
/* -------------------------------------------------------------------- */
|
||||
|
||||
#ifndef __HBQTWEBKIT_H
|
||||
#define __HBQTWEBKIT_H
|
||||
|
||||
#include "hbqt.h"
|
||||
|
||||
HB_EXTERN_BEGIN
|
||||
|
||||
extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebFrame );
|
||||
extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebHistory );
|
||||
extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebHistoryInterface );
|
||||
extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebHistoryItem );
|
||||
extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebHitTestResult );
|
||||
extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebPage );
|
||||
extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebPluginFactory );
|
||||
extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebSecurityOrigin );
|
||||
extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebSettings );
|
||||
extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebView );
|
||||
|
||||
extern HB_EXPORT void * hbqt_gcAllocate_QWebFrame( void * pObj, bool bNew );
|
||||
extern HB_EXPORT void * hbqt_gcAllocate_QWebHistory( void * pObj, bool bNew );
|
||||
extern HB_EXPORT void * hbqt_gcAllocate_QWebHistoryInterface( void * pObj, bool bNew );
|
||||
extern HB_EXPORT void * hbqt_gcAllocate_QWebHistoryItem( void * pObj, bool bNew );
|
||||
extern HB_EXPORT void * hbqt_gcAllocate_QWebHitTestResult( void * pObj, bool bNew );
|
||||
extern HB_EXPORT void * hbqt_gcAllocate_QWebPage( void * pObj, bool bNew );
|
||||
extern HB_EXPORT void * hbqt_gcAllocate_QWebPluginFactory( void * pObj, bool bNew );
|
||||
extern HB_EXPORT void * hbqt_gcAllocate_QWebSecurityOrigin( void * pObj, bool bNew );
|
||||
extern HB_EXPORT void * hbqt_gcAllocate_QWebSettings( void * pObj, bool bNew );
|
||||
extern HB_EXPORT void * hbqt_gcAllocate_QWebView( void * pObj, bool bNew );
|
||||
|
||||
HB_EXTERN_END
|
||||
|
||||
#define hbqt_par_QWebFrame( n ) ( ( QWebFrame * ) hbqt_gcpointer( n ) )
|
||||
#define hbqt_par_QWebHistory( n ) ( ( QWebHistory * ) hbqt_gcpointer( n ) )
|
||||
#define hbqt_par_QWebHistoryInterface( n ) ( ( QWebHistoryInterface * ) hbqt_gcpointer( n ) )
|
||||
#define hbqt_par_QWebHistoryItem( n ) ( ( QWebHistoryItem * ) hbqt_gcpointer( n ) )
|
||||
#define hbqt_par_QWebHitTestResult( n ) ( ( QWebHitTestResult * ) hbqt_gcpointer( n ) )
|
||||
#define hbqt_par_QWebPage( n ) ( ( QWebPage * ) hbqt_gcpointer( n ) )
|
||||
#define hbqt_par_QWebPluginFactory( n ) ( ( QWebPluginFactory * ) hbqt_gcpointer( n ) )
|
||||
#define hbqt_par_QWebSecurityOrigin( n ) ( ( QWebSecurityOrigin * ) hbqt_gcpointer( n ) )
|
||||
#define hbqt_par_QWebSettings( n ) ( ( QWebSettings * ) hbqt_gcpointer( n ) )
|
||||
#define hbqt_par_QWebView( n ) ( ( QWebView * ) hbqt_gcpointer( n ) )
|
||||
|
||||
#define HBQT_TYPE_QWebFrame 0xC549CCEE
|
||||
#define HBQT_TYPE_QWebHistory 0x24AE8587
|
||||
#define HBQT_TYPE_QWebHistoryInterface 0x24436755
|
||||
#define HBQT_TYPE_QWebHistoryItem 0x24DEA87F
|
||||
#define HBQT_TYPE_QWebHitTestResult 0xA2B0A23E
|
||||
#define HBQT_TYPE_QWebPage 0xCF0E1A25
|
||||
#define HBQT_TYPE_QWebPluginFactory 0x8313F829
|
||||
#define HBQT_TYPE_QWebSecurityOrigin 0x76EEBFE7
|
||||
#define HBQT_TYPE_QWebSettings 0x77943AAB
|
||||
#define HBQT_TYPE_QWebView 0x25F9078B
|
||||
|
||||
#endif /* __HBQTWEBKIT_H */
|
||||
|
||||
Reference in New Issue
Block a user