fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-12-21 13:07 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)

Browse Source 
* contrib/hbqt/qtgui/QMenuBar.cpp
  * contrib/hbqt/qth/QMenuBar.qth
    ! Fixed one remaining warning at auto generation level.
This commit is contained in:
Pritpal Bedi
2009-12-21 22:16:37 +00:00
parent 06658db263
commit d4e28fc895
3 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harbour/ChangeLog
View File

@@ -17,6 +17,11 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-12-21 13:07 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* contrib/hbqt/qtgui/QMenuBar.cpp
* contrib/hbqt/qth/QMenuBar.qth
! Fixed one remaining warning at auto generation level.
2009-12-21 22:33 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* ChangeLog
! Fixed UTF offset for my commits from last week.

28
harbour/contrib/hbqt/qtgui/QMenuBar.cpp
View File

@@ -66,20 +66,6 @@
#if QT_VERSION >= 0x040500
/*----------------------------------------------------------------------*/
/*
* Constructed[ 14/17 [ 82.35% ] ]
*
* *** Unconvered Prototypes ***
* -----------------------------
*
* OSMenuRef macMenu ()
*
* *** Commented out protos which construct fine but do not compile ***
*
* // QAction * defaultAction () const
* // void setDefaultAction ( QAction * act )
*/
#include <QtCore/QPointer>
#include <QtGui/QMenuBar>
@@ -97,12 +83,12 @@ typedef struct
QPointer< QMenuBar > pq;
} QGC_POINTER_QMenuBar;
QT_G_FUNC( hbqt_gcRelease_QMenuBar )
QT_G_FUNC( release_QMenuBar )
{
QGC_POINTER_QMenuBar * p = ( QGC_POINTER_QMenuBar * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QMenuBar p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QMenuBar ph=%p pq=%p", p->ph, (void *)(p->pq)));
HB_TRACE( HB_TR_DEBUG, ( "release_QMenuBar p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QMenuBar ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
@@ -122,16 +108,16 @@ QT_G_FUNC( hbqt_gcRelease_QMenuBar )
break;
}
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QMenuBar Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QMenuBar Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "NO hbqt_gcRelease_QMenuBar Object Name Missing!" ) );
HB_TRACE( HB_TR_DEBUG, ( "NO release_QMenuBar Object Name Missing!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QMenuBar Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "DEL release_QMenuBar Object Already deleted!" ) );
}
}
@@ -140,7 +126,7 @@ void * hbqt_gcAllocate_QMenuBar( void * pObj )
QGC_POINTER_QMenuBar * p = ( QGC_POINTER_QMenuBar * ) hb_gcAllocate( sizeof( QGC_POINTER_QMenuBar ), hbqt_gcFuncs() );
p->ph = pObj;
p->func = hbqt_gcRelease_QMenuBar;
p->func = release_QMenuBar;
new( & p->pq ) QPointer< QMenuBar >( ( QMenuBar * ) pObj );
HB_TRACE( HB_TR_DEBUG, ( " new_QMenuBar %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
return( p );

2
harbour/contrib/hbqt/qth/QMenuBar.qth
View File

@@ -87,7 +87,7 @@ void clear ()
QAction * insertMenu ( QAction * before, QMenu * menu )
QAction * insertSeparator ( QAction * before )
bool isDefaultUp () const
OSMenuRef macMenu ()
// OSMenuRef macMenu ()
void setActiveAction ( QAction * act )
// void setDefaultAction ( QAction * act )
void setDefaultUp ( bool )