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

2010-07-15 07:12 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* contrib/hbdoc2/hbdoc2.prg
  * contrib/hbdoc2/hbdoc2.hbp
  - contrib/hbdoc2/genhbd.prg
    - Deleted .hbd geneation from hbdoc2. This tool will 
      have to redesigned to use core hbdoc load/save functions, 
      etetc.

  ; Patches by Tamas Tevesz:

  * src/pp/ppcore.c
    ! Fixed very old bad type on one of the PP error msgs.

  * contrib/gtwvg/wvgwin.c
  * contrib/gtwvg/wvgwing.c
  * contrib/hbwin/win_shell.c
    * Cleanups after recent changes.
This commit is contained in:
Viktor Szakats
2010-07-15 05:14:56 +00:00
parent c79bd14bd8
commit 5c7a07b0ba
8 changed files with 43 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
harbour/ChangeLog
View File

@@ -16,11 +16,29 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-07-15 07:12 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbdoc2/hbdoc2.prg
* contrib/hbdoc2/hbdoc2.hbp
- contrib/hbdoc2/genhbd.prg
- Deleted .hbd geneation from hbdoc2. This tool will
have to redesigned to use core hbdoc load/save functions,
etetc.
; Patches by Tamas Tevesz:
* src/pp/ppcore.c
! Fixed very old bad type on one of the PP error msgs.
* contrib/gtwvg/wvgwin.c
* contrib/gtwvg/wvgwing.c
* contrib/hbwin/win_shell.c
* Cleanups after recent changes.
2010-07-14 18:06 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbqt/hbqt_hbqplaintextedit.cpp
! Fixed: a nasty bug in :paintEvent plus its subsidiaries.
The bug went unnoticed on Windows by some reasons unknown,
though it is documented in Qt help. This is repoted by
though it is documented in Qt help. This is repoted by
Antonio Linares when he was testing hbIDE on OSX.
* contrib/hbxbp/xbpbrowse.prg
@@ -29,19 +47,19 @@
* contrib/hbide/idebrowse.prg
* contrib/hbide/idesaveload.prg
+ Implemented: indexed table navigation. Current implementation
only supports structural indexes in DBFCDX. Click on some
table header, point to "Index" ideDBU toolbar icon and click
only supports structural indexes in DBFCDX. Click on some
table header, point to "Index" ideDBU toolbar icon and click
on drop-down list of index tags and expressions, select one
and this index will become the active one.
+ Implemented: search feature on indesed tables, only for string
fields. While staying inside a browser, press CTRL+F (Find),
provide serach string, and there you will be.
provide serach string, and there you will be.
+ Titlebar now holds the various facts about the navigation.
Tooltip on the titlebar holds the table's full path.
TODO: after settling all actions, a left-side toolbar will
TODO: after settling all actions, a left-side toolbar will
hold them as icons. One toolbar only for all panels and browsers.
If you have better ideas please forward.

24
harbour/contrib/gtwvg/wvgwin.c
View File

@@ -74,30 +74,6 @@
/*----------------------------------------------------------------------*/
/*----------------------------------------------------------------------*/
#if defined( __BORLANDC__ )
# if !defined( NONAMELESSUNION )
# define NONAMELESSUNION
# endif
# if defined( DUMMYUNIONNAME )
# undef DUMMYUNIONNAME
# endif
# if defined( DUMMYUNIONNAME2 )
# undef DUMMYUNIONNAME2
# endif
# if defined( DUMMYUNIONNAME3 )
# undef DUMMYUNIONNAME3
# endif
# if defined( DUMMYUNIONNAME4 )
# undef DUMMYUNIONNAME4
# endif
# if defined( DUMMYUNIONNAME5 )
# undef DUMMYUNIONNAME5
# endif
# define HB_WIN_V_UNION( x, y, z ) ((x).y.z)
#else
# define HB_WIN_V_UNION( x, y, z ) ((x).z)
#endif
#include "gtwvg.h"
#include "hbwapi.h"

19
harbour/contrib/gtwvg/wvgwing.c
View File

@@ -93,9 +93,6 @@
# if defined( DUMMYUNIONNAME5 )
# undef DUMMYUNIONNAME5
# endif
# define HB_WIN_V_UNION( x, y, z ) ((x).y.z)
#else
# define HB_WIN_V_UNION( x, y, z ) ((x).z)
#endif
#include "gtwvg.h"
@@ -103,6 +100,12 @@
#include <windowsx.h>
#if defined( NONAMELESSUNION )
# define HB_WIN_V_UNION( x, z ) ((x).DUMMYUNIONNAME.z)
#else
# define HB_WIN_V_UNION( x, z ) ((x).z)
#endif
#if !defined( GCLP_HBRBACKGROUND )
# define GCLP_HBRBACKGROUND -10
#endif
@@ -709,15 +712,15 @@ HB_FUNC( WVG_TREEVIEW_ADDITEM )
LPTSTR text = HB_TCHAR_CONVTO( hb_parcx( 3 ) );
tvis.hInsertAfter = TVI_LAST;
HB_WIN_V_UNION( tvis, u, item.mask ) = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_STATE;
HB_WIN_V_UNION( tvis, u, item.cchTextMax ) = MAX_PATH + 1;
HB_WIN_V_UNION( tvis, u, item.stateMask ) = TVIS_BOLD | TVIS_CUT | TVIS_DROPHILITED |
HB_WIN_V_UNION( tvis, item.mask ) = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_STATE;
HB_WIN_V_UNION( tvis, item.cchTextMax ) = MAX_PATH + 1;
HB_WIN_V_UNION( tvis, item.stateMask ) = TVIS_BOLD | TVIS_CUT | TVIS_DROPHILITED |
TVIS_EXPANDEDONCE | TVIS_SELECTED | TVIS_EXPANDPARTIAL |
TVIS_OVERLAYMASK | TVIS_STATEIMAGEMASK | TVIS_USERMASK;
HB_WIN_V_UNION( tvis, u, item.state ) = 0; /* TVI_BOLD */
HB_WIN_V_UNION( tvis, item.state ) = 0; /* TVI_BOLD */
tvis.hParent = HB_ISNUM( 2 ) ? ( HTREEITEM ) wvg_parhandle( 2 ) : NULL;
HB_WIN_V_UNION( tvis, u, item.pszText ) = text;
HB_WIN_V_UNION( tvis, item.pszText ) = text;
hb_retnint( ( HB_PTRDIFF ) TreeView_InsertItem( wvg_parhwnd( 1 ), &tvis ) );

134
harbour/contrib/hbdoc2/genhbd.prg
View File

@@ -1,134 +0,0 @@
/*
* $Id$
*/
/*
* Harbour Project source code:
* Document generator - HBFDB output
*
* Copyright 2010 Viktor Szakats (harbour 01 syenar hu)
* 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 "hbclass.ch"
#include "inkey.ch"
#include "fileio.ch"
#include "hbdoc2.ch"
CLASS GenerateHBD FROM TPLGenerate
HIDDEN:
PROTECTED:
EXPORTED:
METHOD NewIndex( cFolder, cFilename, cTitle )
METHOD NewDocument( cFolder, cFilename, cTitle )
METHOD AddEntry( oEntry )
METHOD AddIndex( oEntry ) HIDDEN
METHOD BeginSection( cSection, cFilename )
METHOD EndSection( cSection, cFilename )
METHOD Generate()
METHOD WriteEntry( cCaption, cEntry, lPreformatted ) HIDDEN
VAR aProto INIT {}
VAR cFileName INIT "out"
ENDCLASS
METHOD NewDocument( cFolder, cFilename, cTitle ) CLASS GenerateHBD
HB_SYMBOL_UNUSED( cFolder )
HB_SYMBOL_UNUSED( cTitle )
::cFileName := cFileName
RETURN self
METHOD NewIndex( cFolder, cFilename, cTitle ) CLASS GenerateHBD
HB_SYMBOL_UNUSED( cFolder )
HB_SYMBOL_UNUSED( cFileName )
HB_SYMBOL_UNUSED( cTitle )
RETURN self
METHOD BeginSection( cSection, cFilename ) CLASS GenerateHBD
HB_SYMBOL_UNUSED( cSection )
HB_SYMBOL_UNUSED( cFileName )
RETURN self
METHOD EndSection( cSection, cFilename ) CLASS GenerateHBD
HB_SYMBOL_UNUSED( cSection )
HB_SYMBOL_UNUSED( cFilename )
RETURN self
METHOD AddIndex( oEntry ) CLASS GenerateHBD
HB_SYMBOL_UNUSED( oEntry )
RETURN self
METHOD AddEntry( oEntry ) CLASS GenerateHBD
LOCAL idx
HB_SYMBOL_UNUSED( oEntry )
FOR idx := 1 TO Len( oEntry:Fields )
IF oEntry:Fields[ idx ][ 1 ] == "SYNTAX"
AAdd( ::aProto, oEntry:&( oEntry:Fields[ idx ][ 1 ] ) )
ENDIF
NEXT
RETURN self
METHOD Generate() CLASS GenerateHBD
LOCAL cDir, cName
hb_FNameSplit( ::cFileName, @cDir, @cName )
hb_MemoWrit( hb_FNameMerge( cDir, cName, ".hbd" ), hb_serialize( ::aProto ) )
RETURN self
METHOD PROCEDURE WriteEntry( cCaption, cEntry, lPreformatted ) CLASS GenerateHBD
HB_SYMBOL_UNUSED( cCaption )
HB_SYMBOL_UNUSED( cEntry )
HB_SYMBOL_UNUSED( lPreformatted )
RETURN

1
harbour/contrib/hbdoc2/hbdoc2.hbp
View File

@@ -12,7 +12,6 @@
hbdoc2.prg
genhbd.prg
gentpl.prg
gentxt.prg
genhtml.prg

2
harbour/contrib/hbdoc2/hbdoc2.prg
View File

@@ -136,7 +136,7 @@ PROCEDURE Main( ... )
/* internal settings, values, etc */ ;
"PATH_SEPARATOR", hb_ps(), ;
"DELIMITER", "$", ;
"format-list", { "text", "ascii", "html", "html2", "xml", "hbd", "rtf", "hpc", "ngi", "os2", "chm", "ch2", "pdf", "trf", "doc", "dbf", "all" }, ;
"format-list", { "text", "ascii", "html", "html2", "xml", "rtf", "hpc", "ngi", "os2", "chm", "ch2", "pdf", "trf", "doc", "dbf", "all" }, ;
"hbextern.ch", {}, ;
"in hbextern", {}, ;
"not in hbextern", {}, ;

11
harbour/contrib/hbwin/win_shell.c
View File

@@ -76,13 +76,16 @@
# if defined( DUMMYUNIONNAME5 )
# undef DUMMYUNIONNAME5
# endif
# define HB_WIN_V_UNION( x, y, z ) ((x).y.z)
#else
# define HB_WIN_V_UNION( x, y, z ) ((x).z)
#endif
#include <shellapi.h>
#if defined( NONAMELESSUNION )
# define HB_WIN_V_UNION( x, z ) ((x).DUMMYUNIONNAME.z)
#else
# define HB_WIN_V_UNION( x, z ) ((x).z)
#endif
/* WIN_ShellNotifyIcon( [<hWnd>], [<nUID>], [<nMessage>], [<hIcon>],
[<cTooltip>], [<lAddDel>],
[<cInfo>], [<nInfoTimeOut>], [<cInfoTitle>], [<nInfoFlags>] ) -> <lOK> */
@@ -109,7 +112,7 @@ HB_FUNC( WIN_SHELLNOTIFYICON )
{
if( HB_ITEMCOPYSTR( hb_param( 7, HB_IT_ANY ), tnid.szInfo, HB_SIZEOFARRAY( tnid.szInfo ) ) > 0 )
tnid.uFlags |= NIF_INFO;
HB_WIN_V_UNION( tnid, u, uTimeout ) = ( UINT ) hb_parni( 8 );
HB_WIN_V_UNION( tnid, uTimeout ) = ( UINT ) hb_parni( 8 );
if( HB_ITEMCOPYSTR( hb_param( 9, HB_IT_ANY ), tnid.szInfoTitle, HB_SIZEOFARRAY( tnid.szInfoTitle ) ) > 0 )
tnid.uFlags |= NIF_INFO;
tnid.dwInfoFlags = ( DWORD ) hb_parnl( 10 );

2
harbour/src/pp/ppcore.c
View File

@@ -124,7 +124,7 @@ static const char * hb_pp_szErrors[] =
"Empty optional clause in #translate/#command", /* C2065 */
"Unclosed optional clause in #translate/#command", /* C2066 */
"Error in #ifdef", /* C2068 */
"#endif does not match #endif", /* C2069 */
"#endif does not match #ifdef", /* C2069 */
"#else does not match #ifdef", /* C2070 */
"Error in #undef", /* C2071 */
"Ambiguous match pattern in #translate/#command", /* C2072 */