From 4cd34aa08307c5b7985219887ac0146ae45f66a8 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 12 Mar 2011 18:25:33 +0000 Subject: [PATCH] 2011-03-12 19:24 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbqt/qtgui/hbqt_init.cpp * contrib/hbqt/qtcore/hbqt_pointer.cpp * contrib/hbqt/qtcore/hbqt.h * contrib/hbqt/qtcore/hbqt_hbqevents.cpp * contrib/hbqt/qtcore/hbqt_init.cpp * Changed the way low level event objects are created. * contrib/hbqt/qtcore/qth/QResource.qth ! Fix to unregisterresource functions. ; [Francesco Perillo] --- harbour/ChangeLog | 13 + harbour/contrib/hbqt/qtcore/hbqt.h | 3 +- .../contrib/hbqt/qtcore/hbqt_hbqevents.cpp | 17 +- harbour/contrib/hbqt/qtcore/hbqt_init.cpp | 4 +- harbour/contrib/hbqt/qtcore/hbqt_pointer.cpp | 1 + harbour/contrib/hbqt/qtcore/qth/QResource.qth | 40 ++- harbour/contrib/hbqt/qtgui/hbqt_init.cpp | 278 ++++++++++-------- 7 files changed, 220 insertions(+), 136 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 20a1ae4a62..3cdb07cc3c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,19 @@ The license applies to all entries newer than 2009-04-28. */ +2011-03-12 19:24 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbqt/qtgui/hbqt_init.cpp + * contrib/hbqt/qtcore/hbqt_pointer.cpp + * contrib/hbqt/qtcore/hbqt.h + * contrib/hbqt/qtcore/hbqt_hbqevents.cpp + * contrib/hbqt/qtcore/hbqt_init.cpp + * Changed the way low level event objects are created. + + * contrib/hbqt/qtcore/qth/QResource.qth + ! Fix to unregisterresource functions. + + ; [Francesco Perillo] + 2011-03-11 13:41 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * config/postinst.hbs * Changed to use target platform instead of host diff --git a/harbour/contrib/hbqt/qtcore/hbqt.h b/harbour/contrib/hbqt/qtcore/hbqt.h index 85ed72f620..3b229f104d 100644 --- a/harbour/contrib/hbqt/qtcore/hbqt.h +++ b/harbour/contrib/hbqt/qtcore/hbqt.h @@ -86,10 +86,11 @@ typedef struct } HBQT_GC_T; typedef void ( * PHBQT_SLOT_FUNC )( PHB_ITEM * codeblock, void ** arguments, QStringList pList ); +typedef void * ( * PHBQT_EVENT_FUNC )( void * pObj, bool bNew ); HB_EXTERN_BEGIN -extern HB_EXPORT void hbqt_events_register_createobj( QEvent::Type eventtype, QByteArray szCreateObj ); +extern HB_EXPORT void hbqt_events_register_createobj( QEvent::Type eventtype, QByteArray szCreateObj, PHBQT_EVENT_FUNC pCallback ); extern HB_EXPORT void hbqt_events_unregister_createobj( QEvent::Type eventtype ); extern HB_EXPORT void hbqt_slots_register_callback( QByteArray sig, PHBQT_SLOT_FUNC pCallback ); extern HB_EXPORT void hbqt_slots_unregister_callback( QByteArray sig ); diff --git a/harbour/contrib/hbqt/qtcore/hbqt_hbqevents.cpp b/harbour/contrib/hbqt/qtcore/hbqt_hbqevents.cpp index fa1f565a31..403a5b4dac 100644 --- a/harbour/contrib/hbqt/qtcore/hbqt_hbqevents.cpp +++ b/harbour/contrib/hbqt/qtcore/hbqt_hbqevents.cpp @@ -73,8 +73,10 @@ static QList s_lstEvent; static QList s_lstCreateObj; +static QList s_pEventAllocateCallback; -void hbqt_events_register_createobj( QEvent::Type eventtype, QByteArray szCreateObj ) + +void hbqt_events_register_createobj( QEvent::Type eventtype, QByteArray szCreateObj, PHBQT_EVENT_FUNC pCallback ) { int iIndex = s_lstEvent.indexOf( eventtype ); @@ -82,6 +84,7 @@ void hbqt_events_register_createobj( QEvent::Type eventtype, QByteArray szCreate { s_lstEvent << eventtype; s_lstCreateObj << szCreateObj.toUpper(); + s_pEventAllocateCallback << pCallback; } else s_lstCreateObj[ iIndex ] = szCreateObj.toUpper(); @@ -95,6 +98,7 @@ void hbqt_events_unregister_createobj( QEvent::Type eventtype ) { s_lstEvent.removeAt( iIndex ); s_lstCreateObj.removeAt( iIndex ); + s_pEventAllocateCallback.removeAt( iIndex ); } } @@ -208,10 +212,15 @@ bool HBQEvents::eventFilter( QObject * object, QEvent * event ) int eventId = s_lstEvent.indexOf( eventtype ); if( eventId > -1 && hb_vmRequestReenter() ) { - PHB_ITEM pEvent = hbqt_create_object( event, s_lstCreateObj.at( eventId ) ); + PHBQT_EVENT_FUNC pCallback = s_pEventAllocateCallback.at( found - 1 ); + if( pCallback ) + { + PHB_ITEM pEvent = hbqt_create_objectGC( ( * pCallback )( event, false ), s_lstCreateObj.at( eventId ) ); - ret = hb_itemGetL( hb_vmEvalBlockV( ( PHB_ITEM ) listBlock.at( found - 1 ), 1, pEvent ) ); - hb_itemRelease( pEvent ); + ret = hb_itemGetL( hb_vmEvalBlockV( ( PHB_ITEM ) listBlock.at( found - 1 ), 1, pEvent ) ); + + hb_itemRelease( pEvent ); + } hb_vmRequestRestore(); if( eventtype == QEvent::Close ) diff --git a/harbour/contrib/hbqt/qtcore/hbqt_init.cpp b/harbour/contrib/hbqt/qtcore/hbqt_init.cpp index 849e6e3a27..6f7d432c55 100644 --- a/harbour/contrib/hbqt/qtcore/hbqt_init.cpp +++ b/harbour/contrib/hbqt/qtcore/hbqt_init.cpp @@ -93,6 +93,8 @@ extern void * hbqt_gcAllocate_QTime( void * pObj, bool bNew ); extern void * hbqt_gcAllocate_QModelIndex( void * pObj, bool bNew ); extern void * hbqt_gcAllocate_QStringList( void * pObj, bool bNew ); extern void * hbqt_gcAllocate_QList( void * pObj, bool bNew ); + +extern void * hbqt_gcAllocate_QEvent( void * pObj, bool bNew ); HB_EXTERN_END /*----------------------------------------------------------------------*/ @@ -401,7 +403,7 @@ static void hbqt_registerCallbacks( void ) hbqt_slots_register_callback( "QUrl" , hbqt_SlotsExecQUrl ); hbqt_slots_register_callback( "QObject*" , hbqt_SlotsExecQObject ); - hbqt_events_register_createobj( QEvent::Timer , "hb_QEvent" ); + hbqt_events_register_createobj( QEvent::Timer , "hb_QEvent" , hbqt_gcAllocate_QEvent ); } /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtcore/hbqt_pointer.cpp b/harbour/contrib/hbqt/qtcore/hbqt_pointer.cpp index 4886d24cf6..88c50fcda8 100644 --- a/harbour/contrib/hbqt/qtcore/hbqt_pointer.cpp +++ b/harbour/contrib/hbqt/qtcore/hbqt_pointer.cpp @@ -151,6 +151,7 @@ void * hbqt_gcpointer( int iParam ) if( p && p->ph ) { + HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcpointer(): returns p->: %p", p->ph ) ); return p->ph; } else if( HB_ISPOINTER( iParam ) ) diff --git a/harbour/contrib/hbqt/qtcore/qth/QResource.qth b/harbour/contrib/hbqt/qtcore/qth/QResource.qth index f93a608ade..fb44d092d2 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QResource.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QResource.qth @@ -57,7 +57,7 @@ bool registerResource ( const QString & rccFileName, const QString & mapRoot = Q { void * pText1 = NULL; void * pText2 = NULL; - hb_retl( _resource->registerResource( hb_parstr_utf8( 1, &pText1, NULL ), hb_parstr_utf8( 2, &pText2, NULL ) ) ); /* REM A1 */ + hb_retl( _resource->registerResource( hb_parstr_utf8( 1, &pText1, NULL ), hb_parstr_utf8( 2, &pText2, NULL ) ) ); hb_strfree( pText1 ); hb_strfree( pText2 ); } @@ -74,7 +74,7 @@ bool registerResource_1 ( const uchar * rccData, const QString & mapRoot = QStri if( pcount <= 2 && HB_ISCHAR( 1 ) && ( pcount < 2 || HB_ISCHAR( 2 ) ) ) { void * pText = NULL; - hb_retl( _resource->registerResource( ( const uchar * ) hb_parc( 1 ), hb_parstr_utf8( 2, &pText, NULL ) ) ); /* REM A1 */ + hb_retl( _resource->registerResource( ( const uchar * ) hb_parc( 1 ), hb_parstr_utf8( 2, &pText, NULL ) ) ); hb_strfree( pText ); } else @@ -83,8 +83,40 @@ bool registerResource_1 ( const uchar * rccData, const QString & mapRoot = QStri } QStringList searchPaths () -bool unregisterResource ( const QString & rccFileName, const QString & mapRoot = QString() ) -bool unregisterResource ( const uchar * rccData, const QString & mapRoot = QString() ) + +bool unregisterResource ( const QString & rccFileName, const QString & mapRoot = QString() ) { + QResource * _resource = ( QResource * ) hbqt_pPtrFromObj( 0 ); + if( _resource ) + { + int pcount = hb_pcount(); + if( pcount <= 2 && HB_ISCHAR( 1 ) && ( pcount < 2 || HB_ISCHAR( 2 ) ) ) + { + void * pText1 = NULL; + void * pText2 = NULL; + hb_retl( _resource->unregisterResource( hb_parstr_utf8( 1, &pText1, NULL ), hb_parstr_utf8( 2, &pText2, NULL ) ) ); + hb_strfree( pText1 ); + hb_strfree( pText2 ); + } + else + hb_errRT_BASE( EG_ARG, 9999, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); + } +} + +bool unregisterResource_1 ( const uchar * rccData, const QString & mapRoot = QString() ) { + QResource * _resource = ( QResource * ) hbqt_pPtrFromObj( 0 ); + if( _resource ) + { + int pcount = hb_pcount(); + if( pcount <= 2 && HB_ISCHAR( 1 ) && ( pcount < 2 || HB_ISCHAR( 2 ) ) ) + { + void * pText = NULL; + hb_retl( _resource->unregisterResource( ( const uchar * ) hb_parc( 1 ), hb_parstr_utf8( 2, &pText, NULL ) ) ); + hb_strfree( pText ); + } + else + hb_errRT_BASE( EG_ARG, 9999, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); + } +} diff --git a/harbour/contrib/hbqt/qtgui/hbqt_init.cpp b/harbour/contrib/hbqt/qtgui/hbqt_init.cpp index 5adb933840..d1fbe402af 100644 --- a/harbour/contrib/hbqt/qtgui/hbqt_init.cpp +++ b/harbour/contrib/hbqt/qtgui/hbqt_init.cpp @@ -99,6 +99,32 @@ extern void * hbqt_gcAllocate_QListWidgetItem( void * pObj, bool bNew ); extern void * hbqt_gcAllocate_QTreeWidgetItem( void * pObj, bool bNew ); extern void * hbqt_gcAllocate_QTableWidgetItem( void * pObj, bool bNew ); extern void * hbqt_gcAllocate_QWidget( void * pObj, bool bNew ); + +extern void * hbqt_gcAllocate_QContextMenuEvent( void * pObj, bool bNew ); +extern void * hbqt_gcAllocate_QDragEnterEvent( void * pObj, bool bNew ); +extern void * hbqt_gcAllocate_QDragLeaveEvent( void * pObj, bool bNew ); +extern void * hbqt_gcAllocate_QDropEvent( void * pObj, bool bNew ); +extern void * hbqt_gcAllocate_QEvent( void * pObj, bool bNew ); +extern void * hbqt_gcAllocate_QFocusEvent( void * pObj, bool bNew ); +extern void * hbqt_gcAllocate_QGraphicsSceneContextMenuEvent( void * pObj, bool bNew ); +extern void * hbqt_gcAllocate_QGraphicsSceneMouseEvent( void * pObj, bool bNew ); +extern void * hbqt_gcAllocate_QGraphicsSceneDragDropEvent( void * pObj, bool bNew ); +extern void * hbqt_gcAllocate_QGraphicsSceneHoverEvent( void * pObj, bool bNew ); +extern void * hbqt_gcAllocate_QGraphicsSceneMoveEvent( void * pObj, bool bNew ); +extern void * hbqt_gcAllocate_QGraphicsSceneResizeEvent( void * pObj, bool bNew ); +extern void * hbqt_gcAllocate_QGraphicsSceneWheelEvent( void * pObj, bool bNew ); +extern void * hbqt_gcAllocate_QHelpEvent( void * pObj, bool bNew ); +extern void * hbqt_gcAllocate_QHideEvent( void * pObj, bool bNew ); +extern void * hbqt_gcAllocate_QInputMethodEvent( void * pObj, bool bNew ); +extern void * hbqt_gcAllocate_QKeyEvent( void * pObj, bool bNew ); +extern void * hbqt_gcAllocate_QMouseEvent( void * pObj, bool bNew ); +extern void * hbqt_gcAllocate_QMoveEvent( void * pObj, bool bNew ); +extern void * hbqt_gcAllocate_QPaintEvent( void * pObj, bool bNew ); +extern void * hbqt_gcAllocate_QResizeEvent( void * pObj, bool bNew ); +extern void * hbqt_gcAllocate_QShowEvent( void * pObj, bool bNew ); +extern void * hbqt_gcAllocate_QWheelEvent( void * pObj, bool bNew ); +extern void * hbqt_gcAllocate_QWindowStateChangeEvent( void * pObj, bool bNew ); + HB_EXTERN_END /*----------------------------------------------------------------------*/ @@ -423,134 +449,134 @@ static void hbqt_registerCallbacks( void ) hbqt_slots_register_callback( "QListWidgetItem*" , hbqt_SlotsExecQListWidgetItem ); hbqt_slots_register_callback( "QWidget*" , hbqt_SlotsExecQWidget ); - hbqt_events_register_createobj( QEvent::MouseButtonPress , "hb_QMouseEvent" ); - hbqt_events_register_createobj( QEvent::MouseButtonRelease , "hb_QMouseEvent" ); - hbqt_events_register_createobj( QEvent::MouseButtonDblClick , "hb_QMouseEvent" ); - hbqt_events_register_createobj( QEvent::MouseMove , "hb_QMouseEvent" ); - hbqt_events_register_createobj( QEvent::KeyPress , "hb_QKeyEvent" ); - hbqt_events_register_createobj( QEvent::KeyRelease , "hb_QKeyEvent" ); - hbqt_events_register_createobj( QEvent::FocusIn , "hb_QFocusEvent" ); - hbqt_events_register_createobj( QEvent::FocusOut , "hb_QFocusEvent" ); - hbqt_events_register_createobj( QEvent::Enter , "hb_QMouseEvent" ); - hbqt_events_register_createobj( QEvent::Leave , "hb_QMouseEvent" ); - hbqt_events_register_createobj( QEvent::Paint , "hb_QPaintEvent" ); - hbqt_events_register_createobj( QEvent::Move , "hb_QMoveEvent" ); - hbqt_events_register_createobj( QEvent::Resize , "hb_QResizeEvent" ); - hbqt_events_register_createobj( QEvent::Show , "hb_QShowEvent" ); - hbqt_events_register_createobj( QEvent::Hide , "hb_QHideEvent" ); - hbqt_events_register_createobj( QEvent::Close , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::ParentChange , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::WindowActivate , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::WindowDeactivate , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::ShowToParent , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::HideToParent , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::Wheel , "hb_QWheelEvent" ); - hbqt_events_register_createobj( QEvent::WindowTitleChange , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::WindowIconChange , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::ApplicationWindowIconChange , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::ApplicationFontChange , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::ApplicationLayoutDirectionChange , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::ApplicationPaletteChange , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::PaletteChange , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::Clipboard , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::MetaCall , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::SockAct , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::ShortcutOverride , "hb_QKeyEvent" ); - hbqt_events_register_createobj( QEvent::DeferredDelete , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::DragEnter , "hb_QDragEnterEvent" ); - hbqt_events_register_createobj( QEvent::DragLeave , "hb_QDragLeaveEvent" ); - hbqt_events_register_createobj( QEvent::DragMove , "hb_QDragMoveEvent" ); - hbqt_events_register_createobj( QEvent::Drop , "hb_QDropEvent" ); - hbqt_events_register_createobj( QEvent::ChildAdded , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::ChildPolished , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::ChildRemoved , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::PolishRequest , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::Polish , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::LayoutRequest , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::UpdateRequest , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::UpdateLater , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::ContextMenu , "hb_QContextMenuEvent" ); - hbqt_events_register_createobj( QEvent::InputMethod , "hb_QInputMethodEvent" ); - hbqt_events_register_createobj( QEvent::AccessibilityPrepare , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::TabletMove , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::LocaleChange , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::LanguageChange , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::LayoutDirectionChange , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::TabletPress , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::TabletRelease , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::OkRequest , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::IconDrag , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::FontChange , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::EnabledChange , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::ActivationChange , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::StyleChange , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::IconTextChange , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::ModifiedChange , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::WindowBlocked , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::WindowUnblocked , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::WindowStateChange , "hb_QWindowStateChangeEvent" ); - hbqt_events_register_createobj( QEvent::MouseTrackingChange , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::ToolTip , "hb_QHelpEvent" ); - hbqt_events_register_createobj( QEvent::WhatsThis , "hb_QHelpEvent" ); - hbqt_events_register_createobj( QEvent::StatusTip , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::ActionChanged , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::ActionAdded , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::ActionRemoved , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::FileOpen , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::Shortcut , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::WhatsThisClicked , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::AccessibilityHelp , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::ToolBarChange , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::ApplicationActivate , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::ApplicationActivated , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::ApplicationDeactivate , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::QueryWhatsThis , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::EnterWhatsThisMode , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::LeaveWhatsThisMode , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::ZOrderChange , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::HoverEnter , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::HoverLeave , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::HoverMove , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::AccessibilityDescription , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::ParentAboutToChange , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::WinEventAct , "hb_QEvent" ); + hbqt_events_register_createobj( QEvent::MouseButtonPress , "hb_QMouseEvent" , hbqt_gcAllocate_QMouseEvent ); + hbqt_events_register_createobj( QEvent::MouseButtonRelease , "hb_QMouseEvent" , hbqt_gcAllocate_QMouseEvent ); + hbqt_events_register_createobj( QEvent::MouseButtonDblClick , "hb_QMouseEvent" , hbqt_gcAllocate_QMouseEvent ); + hbqt_events_register_createobj( QEvent::MouseMove , "hb_QMouseEvent" , hbqt_gcAllocate_QMouseEvent ); + hbqt_events_register_createobj( QEvent::KeyPress , "hb_QKeyEvent" , hbqt_gcAllocate_QKeyEvent ); + hbqt_events_register_createobj( QEvent::KeyRelease , "hb_QKeyEvent" , hbqt_gcAllocate_QKeyEvent ); + hbqt_events_register_createobj( QEvent::FocusIn , "hb_QFocusEvent" , hbqt_gcAllocate_QFocusEvent ); + hbqt_events_register_createobj( QEvent::FocusOut , "hb_QFocusEvent" , hbqt_gcAllocate_QFocusEvent ); + hbqt_events_register_createobj( QEvent::Enter , "hb_QMouseEvent" , hbqt_gcAllocate_QMouseEvent ); + hbqt_events_register_createobj( QEvent::Leave , "hb_QMouseEvent" , hbqt_gcAllocate_QMouseEvent ); + hbqt_events_register_createobj( QEvent::Paint , "hb_QPaintEvent" , hbqt_gcAllocate_QPaintEvent ); + hbqt_events_register_createobj( QEvent::Move , "hb_QMoveEvent" , hbqt_gcAllocate_QMoveEvent ); + hbqt_events_register_createobj( QEvent::Resize , "hb_QResizeEvent" , hbqt_gcAllocate_QResizeEvent ); + hbqt_events_register_createobj( QEvent::Show , "hb_QShowEvent" , hbqt_gcAllocate_QShowEvent ); + hbqt_events_register_createobj( QEvent::Hide , "hb_QHideEvent" , hbqt_gcAllocate_QHideEvent ); + hbqt_events_register_createobj( QEvent::Close , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::ParentChange , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::WindowActivate , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::WindowDeactivate , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::ShowToParent , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::HideToParent , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::Wheel , "hb_QWheelEvent" , hbqt_gcAllocate_QWheelEvent ); + hbqt_events_register_createobj( QEvent::WindowTitleChange , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::WindowIconChange , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::ApplicationWindowIconChange , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::ApplicationFontChange , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::ApplicationLayoutDirectionChange , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::ApplicationPaletteChange , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::PaletteChange , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::Clipboard , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::MetaCall , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::SockAct , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::ShortcutOverride , "hb_QKeyEvent" , hbqt_gcAllocate_QKeyEvent ); + hbqt_events_register_createobj( QEvent::DeferredDelete , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::DragEnter , "hb_QDragEnterEvent" , hbqt_gcAllocate_QDragEnterEvent ); + hbqt_events_register_createobj( QEvent::DragLeave , "hb_QDragLeaveEvent" , hbqt_gcAllocate_QDragLeaveEvent ); + hbqt_events_register_createobj( QEvent::DragMove , "hb_QDragMoveEvent" , hbqt_gcAllocate_QMoveEvent ); + hbqt_events_register_createobj( QEvent::Drop , "hb_QDropEvent" , hbqt_gcAllocate_QDropEvent ); + hbqt_events_register_createobj( QEvent::ChildAdded , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::ChildPolished , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::ChildRemoved , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::PolishRequest , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::Polish , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::LayoutRequest , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::UpdateRequest , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::UpdateLater , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::ContextMenu , "hb_QContextMenuEvent" , hbqt_gcAllocate_QContextMenuEvent ); + hbqt_events_register_createobj( QEvent::InputMethod , "hb_QInputMethodEvent" , hbqt_gcAllocate_QInputMethodEvent ); + hbqt_events_register_createobj( QEvent::AccessibilityPrepare , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::TabletMove , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::LocaleChange , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::LanguageChange , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::LayoutDirectionChange , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::TabletPress , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::TabletRelease , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::OkRequest , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::IconDrag , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::FontChange , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::EnabledChange , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::ActivationChange , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::StyleChange , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::IconTextChange , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::ModifiedChange , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::WindowBlocked , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::WindowUnblocked , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::WindowStateChange , "hb_QWindowStateChangeEvent" , hbqt_gcAllocate_QWindowStateChangeEvent ); + hbqt_events_register_createobj( QEvent::MouseTrackingChange , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::ToolTip , "hb_QHelpEvent" , hbqt_gcAllocate_QHelpEvent ); + hbqt_events_register_createobj( QEvent::WhatsThis , "hb_QHelpEvent" , hbqt_gcAllocate_QHelpEvent ); + hbqt_events_register_createobj( QEvent::StatusTip , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::ActionChanged , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::ActionAdded , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::ActionRemoved , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::FileOpen , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::Shortcut , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::WhatsThisClicked , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::AccessibilityHelp , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::ToolBarChange , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::ApplicationActivate , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::ApplicationActivated , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::ApplicationDeactivate , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::QueryWhatsThis , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::EnterWhatsThisMode , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::LeaveWhatsThisMode , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::ZOrderChange , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::HoverEnter , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::HoverLeave , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::HoverMove , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::AccessibilityDescription , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::ParentAboutToChange , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::WinEventAct , "hb_QEvent" , hbqt_gcAllocate_QEvent ); #if defined( QT_KEYPAD_NAVIGATION ) - hbqt_events_register_createobj( QEvent::EnterEditFocus , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::LeaveEditFocus , "hb_QEvent" ); + hbqt_events_register_createobj( QEvent::EnterEditFocus , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::LeaveEditFocus , "hb_QEvent" , hbqt_gcAllocate_QEvent ); #endif - hbqt_events_register_createobj( QEvent::MenubarUpdated , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::GraphicsSceneMouseMove , "hb_QGraphicsSceneMouseEvent" ); - hbqt_events_register_createobj( QEvent::GraphicsSceneMousePress , "hb_QGraphicsSceneMouseEvent" ); - hbqt_events_register_createobj( QEvent::GraphicsSceneMouseRelease , "hb_QGraphicsSceneMouseEvent" ); - hbqt_events_register_createobj( QEvent::GraphicsSceneMouseDoubleClick , "hb_QGraphicsSceneMouseEvent" ); - hbqt_events_register_createobj( QEvent::GraphicsSceneContextMenu , "hb_QGraphicsSceneContextMenuEvent" ); - hbqt_events_register_createobj( QEvent::GraphicsSceneHoverEnter , "hb_QGraphicsSceneHoverEvent" ); - hbqt_events_register_createobj( QEvent::GraphicsSceneHoverMove , "hb_QGraphicsSceneHoverEvent" ); - hbqt_events_register_createobj( QEvent::GraphicsSceneHoverLeave , "hb_QGraphicsSceneHoverEvent" ); - hbqt_events_register_createobj( QEvent::GraphicsSceneHelp , "hb_QHelpEvent" ); - hbqt_events_register_createobj( QEvent::GraphicsSceneDragEnter , "hb_QGraphicsSceneDragDropEvent" ); - hbqt_events_register_createobj( QEvent::GraphicsSceneDragMove , "hb_QGraphicsSceneDragDropEvent" ); - hbqt_events_register_createobj( QEvent::GraphicsSceneDragLeave , "hb_QGraphicsSceneDragDropEvent" ); - hbqt_events_register_createobj( QEvent::GraphicsSceneDrop , "hb_QGraphicsSceneDragDropEvent" ); - hbqt_events_register_createobj( QEvent::GraphicsSceneWheel , "hb_QGraphicsSceneWheelEvent" ); - hbqt_events_register_createobj( QEvent::KeyboardLayoutChange , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::DynamicPropertyChange , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::TabletEnterProximity , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::TabletLeaveProximity , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::NonClientAreaMouseMove , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::NonClientAreaMouseButtonPress , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::NonClientAreaMouseButtonRelease , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::NonClientAreaMouseButtonDblClick , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::MacSizeChange , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::ContentsRectChange , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::GraphicsSceneResize , "hb_QGraphicsSceneResizeEvent" ); - hbqt_events_register_createobj( QEvent::GraphicsSceneMove , "hb_QGraphicsSceneMoveEvent" ); - hbqt_events_register_createobj( QEvent::CursorChange , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::ToolTipChange , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::GrabMouse , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::UngrabMouse , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::GrabKeyboard , "hb_QEvent" ); - hbqt_events_register_createobj( QEvent::UngrabKeyboard , "hb_QEvent" ); + hbqt_events_register_createobj( QEvent::MenubarUpdated , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::GraphicsSceneMouseMove , "hb_QGraphicsSceneMouseEvent" , hbqt_gcAllocate_QGraphicsSceneMouseEvent ); + hbqt_events_register_createobj( QEvent::GraphicsSceneMousePress , "hb_QGraphicsSceneMouseEvent" , hbqt_gcAllocate_QGraphicsSceneMouseEvent ); + hbqt_events_register_createobj( QEvent::GraphicsSceneMouseRelease , "hb_QGraphicsSceneMouseEvent" , hbqt_gcAllocate_QGraphicsSceneMouseEvent ); + hbqt_events_register_createobj( QEvent::GraphicsSceneMouseDoubleClick , "hb_QGraphicsSceneMouseEvent" , hbqt_gcAllocate_QGraphicsSceneMouseEvent ); + hbqt_events_register_createobj( QEvent::GraphicsSceneContextMenu , "hb_QGraphicsSceneContextMenuEvent" , hbqt_gcAllocate_QGraphicsSceneContextMenuEvent ); + hbqt_events_register_createobj( QEvent::GraphicsSceneHoverEnter , "hb_QGraphicsSceneHoverEvent" , hbqt_gcAllocate_QGraphicsSceneHoverEvent ); + hbqt_events_register_createobj( QEvent::GraphicsSceneHoverMove , "hb_QGraphicsSceneHoverEvent" , hbqt_gcAllocate_QGraphicsSceneHoverEvent ); + hbqt_events_register_createobj( QEvent::GraphicsSceneHoverLeave , "hb_QGraphicsSceneHoverEvent" , hbqt_gcAllocate_QGraphicsSceneHoverEvent ); + hbqt_events_register_createobj( QEvent::GraphicsSceneHelp , "hb_QHelpEvent" , hbqt_gcAllocate_QHelpEvent ); + hbqt_events_register_createobj( QEvent::GraphicsSceneDragEnter , "hb_QGraphicsSceneDragDropEvent" , hbqt_gcAllocate_QGraphicsSceneDragDropEvent ); + hbqt_events_register_createobj( QEvent::GraphicsSceneDragMove , "hb_QGraphicsSceneDragDropEvent" , hbqt_gcAllocate_QGraphicsSceneDragDropEvent ); + hbqt_events_register_createobj( QEvent::GraphicsSceneDragLeave , "hb_QGraphicsSceneDragDropEvent" , hbqt_gcAllocate_QGraphicsSceneDragDropEvent ); + hbqt_events_register_createobj( QEvent::GraphicsSceneDrop , "hb_QGraphicsSceneDragDropEvent" , hbqt_gcAllocate_QGraphicsSceneDragDropEvent ); + hbqt_events_register_createobj( QEvent::GraphicsSceneWheel , "hb_QGraphicsSceneWheelEvent" , hbqt_gcAllocate_QGraphicsSceneWheelEvent ); + hbqt_events_register_createobj( QEvent::KeyboardLayoutChange , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::DynamicPropertyChange , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::TabletEnterProximity , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::TabletLeaveProximity , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::NonClientAreaMouseMove , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::NonClientAreaMouseButtonPress , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::NonClientAreaMouseButtonRelease , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::NonClientAreaMouseButtonDblClick , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::MacSizeChange , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::ContentsRectChange , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::GraphicsSceneResize , "hb_QGraphicsSceneResizeEvent" , hbqt_gcAllocate_QGraphicsSceneResizeEvent ); + hbqt_events_register_createobj( QEvent::GraphicsSceneMove , "hb_QGraphicsSceneMoveEvent" , hbqt_gcAllocate_QGraphicsSceneMoveEvent ); + hbqt_events_register_createobj( QEvent::CursorChange , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::ToolTipChange , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::GrabMouse , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::UngrabMouse , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::GrabKeyboard , "hb_QEvent" , hbqt_gcAllocate_QEvent ); + hbqt_events_register_createobj( QEvent::UngrabKeyboard , "hb_QEvent" , hbqt_gcAllocate_QEvent ); } /*----------------------------------------------------------------------*/