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

2009-11-15 08:21 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* src/rtl/hbi18n1.c
    ! Fixed bcc warning in recent commit.

  * contrib/gtwvg/tests/demoxbp.prg
    ! Fixed to use HB_SYMBOL_UNUSED() instead of local solution.

  * contrib/gtwvg/tests/demowvg.prg
    + Added dirbase to icon filenames

  * contrib/gtwvg/Makefile
    + Enabled for msvc64 and pocc64.
This commit is contained in:
Viktor Szakats
2009-11-15 07:22:25 +00:00
parent 1e82b55122
commit 8d0fd3dc5a
5 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
harbour/ChangeLog
View File

@@ -17,6 +17,19 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-11-15 08:21 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* src/rtl/hbi18n1.c
! Fixed bcc warning in recent commit.
* contrib/gtwvg/tests/demoxbp.prg
! Fixed to use HB_SYMBOL_UNUSED() instead of local solution.
* contrib/gtwvg/tests/demowvg.prg
+ Added dirbase to icon filenames
* contrib/gtwvg/Makefile
+ Enabled for msvc64 and pocc64.
2009-11-14 22:21 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* contrib/hbqt/hbqt_slots.cpp
* contrib/hbqt/hbqt_slots.h

2
harbour/contrib/gtwvg/Makefile
View File

@@ -54,7 +54,7 @@ PRG_HEADERS := \
HB_SUPPORTED := no
ifeq ($(HB_PLATFORM),win)
ifneq ($(filter $(HB_COMPILER),mingw msvc watcom pocc icc bcc),)
ifneq ($(filter $(HB_COMPILER),mingw msvc msvc64 watcom pocc pocc64 icc bcc),)
HB_SUPPORTED := yes
endif
endif

28
harbour/contrib/gtwvg/tests/demowvg.prg
View File

@@ -1555,13 +1555,13 @@ STATIC FUNCTION MyDialogOne_X( oCrt )
cTxt := cTxt + "Enjoy - Pritpal Bedi, INDIA"
aImg_:={}
aadd( aImg_, "v_lock.bmp" )
aadd( aImg_, "v_new.bmp" )
aadd( aImg_, "v_clclt.bmp" )
aadd( aImg_, "v_calend.bmp" )
aadd( aImg_, "v_index.bmp" )
aadd( aImg_, "v_notes1.bmp" )
aadd( aImg_, "v_selct1.bmp" )
aadd( aImg_, hb_DirBase() + "v_lock.bmp" )
aadd( aImg_, hb_DirBase() + "v_new.bmp" )
aadd( aImg_, hb_DirBase() + "v_clclt.bmp" )
aadd( aImg_, hb_DirBase() + "v_calend.bmp" )
aadd( aImg_, hb_DirBase() + "v_index.bmp" )
aadd( aImg_, hb_DirBase() + "v_notes1.bmp" )
aadd( aImg_, hb_DirBase() + "v_selct1.bmp" )
? '.'
Wvt_ShowWindow( 1 )
nWinRows := 55
@@ -2692,13 +2692,13 @@ STATIC FUNCTION ActiveXBuildToolBar( oDA, nActiveX )
// After setting properties, create toolbar.
oTBar:create()
oTBar:addItem( "New" , 'v_new.bmp' )
oTBar:addItem( "Select" , 'v_selct1.bmp' )
oTBar:addItem( "Calendar" , 'v_calend.bmp' )
oTBar:addItem( "Tools" , 'v_lock.bmp' )
oTBar:addItem( "Index" , 'v_index.bmp' )
oTBar:addItem( "Show" , 'v_clclt.bmp' )
oTBar:addItem( "Hide" , 'v_notes1.bmp' )
oTBar:addItem( "New" , hb_DirBase() + 'v_new.bmp' )
oTBar:addItem( "Select" , hb_DirBase() + 'v_selct1.bmp' )
oTBar:addItem( "Calendar" , hb_DirBase() + 'v_calend.bmp' )
oTBar:addItem( "Tools" , hb_DirBase() + 'v_lock.bmp' )
oTBar:addItem( "Index" , hb_DirBase() + 'v_index.bmp' )
oTBar:addItem( "Show" , hb_DirBase() + 'v_clclt.bmp' )
oTBar:addItem( "Hide" , hb_DirBase() + 'v_notes1.bmp' )
RETURN oTBar
//----------------------------------------------------------------------//

7
harbour/contrib/gtwvg/tests/demoxbp.prg
View File

@@ -427,7 +427,7 @@ STATIC FUNCTION ExeFontDialog( oCrt )
oWvgFont := oFontDlg:display( ++nMode % 2 )
// hb_ToOutDebug( '%s %i', oWvgFont:compoundName, oWvgFont:nominalPointSize )
JustToAvoid( oWvgFont )
HB_SYMBOL_UNUSED( oWvgFont )
oFontDlg:destroy()
@@ -435,11 +435,6 @@ STATIC FUNCTION ExeFontDialog( oCrt )
/*----------------------------------------------------------------------*/
STATIC FUNCTION JustToAvoid()
RETURN NIL
/*----------------------------------------------------------------------*/
STATIC FUNCTION HB_GTSYS()
REQUEST HB_GT_GUI_DEFAULT

1
harbour/src/rtl/hbi18n1.c
View File

@@ -235,7 +235,6 @@ static long hb_i18n_pluralindex( int iForm, PHB_ITEM pNum )
return n == 1 ? 1 : ( ( n >= 2 && n <= 4 ) ? 2 : 3 );
case HB_I18N_PLURAL_SL:
n10 = fmod( n, 10.0 );
n100 = fmod( n, 100.0 );
return n100 == 1 ? 1 : ( n100 == 2 ? 1 : ( n100 == 3 || n100 == 4 ? 3 : 4 ) );