diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8f927bca91..ff49d83c0b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,13 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-09-14 07:30 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/include/hbsxdef.ch + * harbour/contrib/pdflib/pdflib.h + * harbour/source/rtl/tbrowse.prg + * harbour/samples/pe/editorlo.c + * converted TABs to SPACEs + 2007-09-13 20:40 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/utils/hbtest/rt_misc.prg * harbour/utils/hbtest/make_c5x.bat diff --git a/harbour/contrib/pdflib/pdflib.h b/harbour/contrib/pdflib/pdflib.h index 08b390373e..d0bdc6be70 100644 --- a/harbour/contrib/pdflib/pdflib.h +++ b/harbour/contrib/pdflib/pdflib.h @@ -49,7 +49,7 @@ #ifdef WIN32 -#define PDFLIB_CALL __cdecl +#define PDFLIB_CALL __cdecl #ifdef PDFLIB_EXPORTS #define PDFLIB_API __declspec(dllexport) /* prepare a DLL (PDFlib-internal use only) */ @@ -57,17 +57,17 @@ #elif defined(PDFLIB_DLL) #define PDFLIB_API __declspec(dllimport) /* PDFlib clients - import PDFlib DLL fcts. */ -#else /* !PDFLIB_DLL */ -#define PDFLIB_API /* */ /* default: generate or use static library */ +#else /* !PDFLIB_DLL */ +#define PDFLIB_API /* */ /* default: generate or use static library */ -#endif /* !PDFLIB_DLL */ +#endif /* !PDFLIB_DLL */ -#else /* !WIN32 */ +#else /* !WIN32 */ #if (((defined __IBMC__) || (defined __IBMCPP__)) && (defined __DLL__)) #define PDFLIB_CALL _Export #define PDFLIB_API -#endif /* IBM VisualAge C++ DLL */ +#endif /* IBM VisualAge C++ DLL */ #ifndef PDFLIB_CALL #define PDFLIB_CALL @@ -76,7 +76,7 @@ #define PDFLIB_API #endif -#endif /* !WIN32 */ +#endif /* !WIN32 */ /* Make our declarations C++ compatible */ #ifdef __cplusplus @@ -103,11 +103,11 @@ typedef struct PDF_s PDF; */ /* PDFlib version number, major part */ -#define PDFLIB_MAJORVERSION 3 +#define PDFLIB_MAJORVERSION 3 /* PDFlib version number, minor part (must use two decimal places if != 0) */ -#define PDFLIB_MINORVERSION 02 -#define PDFLIB_VERSIONSTRING "3.02" +#define PDFLIB_MINORVERSION 02 +#define PDFLIB_VERSIONSTRING "3.02" /* * ActiveX uses the Class ID; @@ -152,7 +152,7 @@ PDF_new2(errorproc errorhandler, PDFLIB_API void * PDFLIB_CALL PDF_get_opaque(PDF *p); -#endif /* !SWIG */ +#endif /* !SWIG */ /* Create a new PDF object. */ PDFLIB_API PDF * PDFLIB_CALL @@ -180,7 +180,7 @@ PDF_open_fp(PDF *p, FILE *fp); /* Open a new PDF in memory, and install a callback for fetching the data */ PDFLIB_API void PDFLIB_CALL PDF_open_mem(PDF *p, size_t (*writeproc)(PDF *p, void *data, size_t size)); -#endif /* !defined(SWIG) */ +#endif /* !defined(SWIG) */ /* Get the contents of the PDF output buffer. The result must be used by the client before calling any other PDFlib function. Must not be @@ -211,7 +211,7 @@ PDF_end_page(PDF *p); #define PDF_NonfatalError 11 #define PDF_UnknownError 12 -#endif /* !SWIG */ +#endif /* !SWIG */ /* Set some PDFlib parameter with string type */ PDFLIB_API void PDFLIB_CALL @@ -332,7 +332,7 @@ PDF_setpolydash(PDF *p, float *dasharray, int length); #ifndef SWIG /* Maximum length of dash arrays */ -#define MAX_DASH_LENGTH 8 +#define MAX_DASH_LENGTH 8 #endif /* Set the flatness to a value between 0 and 100 inclusive. */ @@ -536,7 +536,7 @@ PDF_close_image(PDF *p, int image); help with preparing the thumbnail, but simply places it in the output. */ PDFLIB_API void PDFLIB_CALL PDF_add_thumbnail(PDF *p, int im); -#endif /* PDF_THUMBNAILS_SUPPORTED */ +#endif /* PDF_THUMBNAILS_SUPPORTED */ /* * ---------------------------------------------------------------------- @@ -648,34 +648,34 @@ Acrobat 4 maximum page size: 200" = 14400 pt = 508 cm /* The page sizes are only available to the C and C++ bindings */ #ifndef SWIG -#define a0_width (float) 2380.0 -#define a0_height (float) 3368.0 -#define a1_width (float) 1684.0 -#define a1_height (float) 2380.0 -#define a2_width (float) 1190.0 -#define a2_height (float) 1684.0 -#define a3_width (float) 842.0 -#define a3_height (float) 1190.0 -#define a4_width (float) 595.0 -#define a4_height (float) 842.0 -#define a5_width (float) 421.0 -#define a5_height (float) 595.0 -#define a6_width (float) 297.0 -#define a6_height (float) 421.0 -#define b5_width (float) 501.0 -#define b5_height (float) 709.0 -#define letter_width (float) 612.0 -#define letter_height (float) 792.0 -#define legal_width (float) 612.0 -#define legal_height (float) 1008.0 -#define ledger_width (float) 1224.0 -#define ledger_height (float) 792.0 -#define p11x17_width (float) 792.0 -#define p11x17_height (float) 1224.0 +#define a0_width (float) 2380.0 +#define a0_height (float) 3368.0 +#define a1_width (float) 1684.0 +#define a1_height (float) 2380.0 +#define a2_width (float) 1190.0 +#define a2_height (float) 1684.0 +#define a3_width (float) 842.0 +#define a3_height (float) 1190.0 +#define a4_width (float) 595.0 +#define a4_height (float) 842.0 +#define a5_width (float) 421.0 +#define a5_height (float) 595.0 +#define a6_width (float) 297.0 +#define a6_height (float) 421.0 +#define b5_width (float) 501.0 +#define b5_height (float) 709.0 +#define letter_width (float) 612.0 +#define letter_height (float) 792.0 +#define legal_width (float) 612.0 +#define legal_height (float) 1008.0 +#define ledger_width (float) 1224.0 +#define ledger_height (float) 792.0 +#define p11x17_width (float) 792.0 +#define p11x17_height (float) 1224.0 #endif #ifdef __cplusplus -} // extern "C" +} /* extern "C" */ #endif -#endif /* PDFLIB_H */ +#endif /* PDFLIB_H */ diff --git a/harbour/include/hbsxdef.ch b/harbour/include/hbsxdef.ch index 405291959a..7612a952c3 100644 --- a/harbour/include/hbsxdef.ch +++ b/harbour/include/hbsxdef.ch @@ -74,11 +74,11 @@ /* * Trigger Toggle Values */ -#define TRIGGER_ENABLE 1 -#define TRIGGER_DISABLE 2 -#define TRIGGER_REMOVE 3 -#define TRIGGER_INSTALL 4 -#define TRIGGER_PENDING 5 /* Internal Use Only */ +#define TRIGGER_ENABLE 1 +#define TRIGGER_DISABLE 2 +#define TRIGGER_REMOVE 3 +#define TRIGGER_INSTALL 4 +#define TRIGGER_PENDING 5 /* Internal Use Only */ /* diff --git a/harbour/samples/pe/editorlo.c b/harbour/samples/pe/editorlo.c index cf8f5e7a74..5a9c537b9b 100644 --- a/harbour/samples/pe/editorlo.c +++ b/harbour/samples/pe/editorlo.c @@ -71,36 +71,36 @@ typedef struct { - int top; /* topmost row of editor's window */ - int left; /* leftmost column of the editor's window */ - int bottom; /* bottom row position */ - int right; /* rightmost column */ - int line_length; /* maximal line length */ - long int line_number; /* the number of lines stored in text buffer */ - long int current_line; /* the offset in memory buffer where the current line starts (where the cursor is positioned) */ - long int first_line; /* offset of the first line (usually 0) */ - long int last_line; /* the offset in memory buffer of the last line */ - int cursor_row; /* current cursor row in the window */ - int cursor_col; /* current cursor column in the window */ - long int first_display; /* the offset of first visible (displayed) line */ - long int last_display; /* the offset of last visible line */ - int first_col; /* first visible column */ - int stable; /* is the editor stabilized? */ - int current_stabil; /* currently displayed row (during stabilisation) */ - int stabil; /* number of rows to stabilize */ - int space; /* should spaces at the end of line be removed */ - char escape; /* ASCII code of color escaspe character (the next character after this will be used as color index */ - long int next_stabil; /* the offset in memory buffer of next line to display */ - int dir; /* the direction of line stabilization */ - int tab_size; /* the number of spaces the replaces TAB character */ - long int active; /* the line number where the cursor is positioned */ - int IsConfigured; - long int next_line; /* the offset of next line to return by ED_GetNextLine() */ - long int text_length; /* the size (in bytes) of edited text */ - long int bufor_size; /* the size of allocated memory buffer */ - char *begin; /* the memory buffer */ + int top; /* topmost row of editor's window */ + int left; /* leftmost column of the editor's window */ + int bottom; /* bottom row position */ + int right; /* rightmost column */ + int line_length; /* maximal line length */ + long int line_number; /* the number of lines stored in text buffer */ + long int current_line; /* the offset in memory buffer where the current line starts (where the cursor is positioned) */ + long int first_line; /* offset of the first line (usually 0) */ + long int last_line; /* the offset in memory buffer of the last line */ + int cursor_row; /* current cursor row in the window */ + int cursor_col; /* current cursor column in the window */ + long int first_display; /* the offset of first visible (displayed) line */ + long int last_display; /* the offset of last visible line */ + int first_col; /* first visible column */ + int stable; /* is the editor stabilized? */ + int current_stabil; /* currently displayed row (during stabilisation) */ + int stabil; /* number of rows to stabilize */ + int space; /* should spaces at the end of line be removed */ + char escape; /* ASCII code of color escaspe character (the next character after this will be used as color index */ + long int next_stabil; /* the offset in memory buffer of next line to display */ + int dir; /* the direction of line stabilization */ + int tab_size; /* the number of spaces the replaces TAB character */ + long int active; /* the line number where the cursor is positioned */ + int IsConfigured; + long int next_line; /* the offset of next line to return by ED_GetNextLine() */ + long int text_length; /* the size (in bytes) of edited text */ + long int bufor_size; /* the size of allocated memory buffer */ + char *begin; /* the memory buffer */ -} EDITOR ; +} EDITOR; @@ -109,7 +109,7 @@ static EDITOR *EStack[] ={ NULL, NULL, NULL, NULL, NULL }; /* table of created editors */ static EDITOR *ETab[] ={ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; -static EDITOR *ED; /* currently serviced editor */ +static EDITOR *ED; /* currently serviced editor */ diff --git a/harbour/source/rtl/tbrowse.prg b/harbour/source/rtl/tbrowse.prg index fa12234363..4760af5f59 100644 --- a/harbour/source/rtl/tbrowse.prg +++ b/harbour/source/rtl/tbrowse.prg @@ -103,7 +103,7 @@ #define TBCI_SETWIDTH 11 // If True, only SetFrozen can change TBCI_WIDTH #define TBCI_LCOLSEP 12 // Should column separator be drawn #define TBCI_SCRCOLPOS 13 // Temporary column position on screen - + #define TBC_CLR_STANDARD 1 // first index value to set unselected data color. #define TBC_CLR_ENHANCED 2 // second index value to set selected data color. #ifdef HB_COMPAT_C53