From 062dcfb5da332d3300adabee772d6b498213974d Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 31 Aug 2012 03:36:45 +0000 Subject: [PATCH] 2012-08-31 05:35 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/hbide/resources/align_at.png * contrib/hbide/resources/browser.png * contrib/hbide/resources/dc_class.png * contrib/hbide/resources/dc_method.png * contrib/hbide/resources/dc_procedure.png * contrib/hbide/resources/dictionary.png * contrib/hbide/resources/editor.png * contrib/hbide/resources/launch_r.png * contrib/hbide/resources/stringify.png % optimized (significantly) * contrib/hbwin/hbwin.hbx * contrib/hbwin/win_osc.c * contrib/xhb/xhb.hbx * contrib/xhb/xwin_ver.c + added WIN_OSIS8() and xhb compatibility OS_ISWIN8() --- harbour/ChangeLog | 306 +++++++++--------- harbour/contrib/hbide/resources/align_at.png | Bin 1052 -> 912 bytes harbour/contrib/hbide/resources/browser.png | Bin 920 -> 818 bytes harbour/contrib/hbide/resources/dc_class.png | Bin 586 -> 436 bytes harbour/contrib/hbide/resources/dc_method.png | Bin 654 -> 459 bytes .../contrib/hbide/resources/dc_procedure.png | Bin 540 -> 393 bytes .../contrib/hbide/resources/dictionary.png | Bin 1353 -> 1154 bytes harbour/contrib/hbide/resources/editor.png | Bin 934 -> 787 bytes harbour/contrib/hbide/resources/launch_r.png | Bin 1391 -> 1307 bytes harbour/contrib/hbide/resources/stringify.png | Bin 245 -> 156 bytes harbour/contrib/hbwin/hbwin.hbx | 1 + harbour/contrib/hbwin/win_osc.c | 7 + harbour/contrib/xhb/xhb.hbx | 1 + harbour/contrib/xhb/xwin_ver.c | 2 + 14 files changed, 173 insertions(+), 144 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index d75c140b96..e5eb16be99 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,10 +16,28 @@ The license applies to all entries newer than 2009-04-28. */ +2012-08-31 05:35 UTC+0200 Viktor Szakats (harbour syenar.net) + * contrib/hbide/resources/align_at.png + * contrib/hbide/resources/browser.png + * contrib/hbide/resources/dc_class.png + * contrib/hbide/resources/dc_method.png + * contrib/hbide/resources/dc_procedure.png + * contrib/hbide/resources/dictionary.png + * contrib/hbide/resources/editor.png + * contrib/hbide/resources/launch_r.png + * contrib/hbide/resources/stringify.png + % optimized (significantly) + + * contrib/hbwin/hbwin.hbx + * contrib/hbwin/win_osc.c + * contrib/xhb/xhb.hbx + * contrib/xhb/xwin_ver.c + + added WIN_OSIS8() and xhb compatibility OS_ISWIN8() + 2012-08-30 16:22 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/browse.prg - % Changed: IdeDBU will be available both ways, new implemented - or previous one. Switching one mode to another will switch + % Changed: IdeDBU will be available both ways, new implemented + or previous one. Switching one mode to another will switch the parenting too. This has rendered IdeDBU versatile, really!!! 2012-08-30 15:56 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) @@ -33,33 +51,33 @@ * contrib/hbide/browse.prg * contrib/hbide/docks.prg * contrib/hbide/main.prg - + Implemented: future ready stacked widget as central widget of + + Implemented: future ready stacked widget as central widget of main window. For now IdeDBU is transferred to one of the stacks. - If preferred by the user, he/she can continue to work as - current. Two button on main toolbar are added. One for IdeDBU + If preferred by the user, he/she can continue to work as + current. Two button on main toolbar are added. One for IdeDBU and another for IdeEDITOR. The functionality is as such: 1. Click on the IdeDBU icon on the main toolbar. - 2. Editing interface will hide and DBU will appear occupying + 2. Editing interface will hide and DBU will appear occupying all of the HbIDE's real-estate. 3. Status-bar will disappear. - 4. Once activated, IdeDBU will not show up in right-side - docking area. If not activated via IdeDBU icon, IdeDBU + 4. Once activated, IdeDBU will not show up in right-side + docking area. If not activated via IdeDBU icon, IdeDBU can be used as before. - 5. Clicking on the IdeEDITOR icon, editing interface will be + 5. Clicking on the IdeEDITOR icon, editing interface will be restored and status-bar will show-up again. - This implementation makes HbIDE future ready in the sense that - application real-estate will never be a problem, and hence, a + This implementation makes HbIDE future ready in the sense that + application real-estate will never be a problem, and hence, a lot of diversified actions can be brought into play. - I am interested in groups views as which other parts can be + I am interested in groups views as which other parts can be brought to this new implementation, existing as well as futuristic. 2012-08-30 13:02 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp ! Done: pairing of #ifdef|#if - #endif. - With this commit pair highlighting is complete until someone + With this commit pair highlighting is complete until someone points to which escaped my knowledge. 2012-08-30 15:30 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) @@ -82,7 +100,7 @@ 2012-08-29 11:43 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbxbp/window.prg * Activated: QEvent_Resize signal be manipulated per Xbase++ docs. - + * contrib/hbxbp/dialog.prg ! Fixed: the way a XbpDialog() was assigned :drawingArea() (a.k.a. centralWidget()) via a .ui file. @@ -103,15 +121,15 @@ + Implemented: creation of .tag file usable as a dictionary. The activation is : - Dictionary will be created in same folder where .hbp resides - having same name with extention .tag. Thus created tags are not + Dictionary will be created in same folder where .hbp resides + having same name with extention .tag. Thus created tags are not populated in the existing list of tags. 2012-08-28 17:50 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/docks.prg * Changed: placement of Selected-text toolbar in stream-selection-mode - to position itself on one line above the current selected row if - selection is performed bottom-up. For bottom-down process, position + to position itself on one line above the current selected row if + selection is performed bottom-up. For bottom-down process, position is at one line below the current row. 2012-08-28 16:45 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) @@ -121,20 +139,20 @@ * contrib/hbide/edit.prg * contrib/hbide/editor.prg + Implementd: Stringify a selection. - The activation is via "Stringify" icon ( added new ) next to + The activation is via "Stringify" icon ( added new ) next to "Double to Single Quotes" icon on editing-instance top toolbar or Selected-text toolbar. - The behavior: + The behavior: Column-selection Mode : - + Simply Superb - Anyway Excellent + Anyway Excellent Left Blanks Starts Here and Ends Longer => "Simply Superb" - "Anyway Excellent" + "Anyway Excellent" " Left Blanks" "Starts Here and Ends Longer" @@ -151,8 +169,8 @@ * contrib/hbide/dict.prg * contrib/hbide/functions.prg * contrib/hbide/saveload.prg - + Added: to load HbIDE created {project_name}.tag files - for "Dictionaries" implementation.The options earlier were + + Added: to load HbIDE created {project_name}.tag files + for "Dictionaries" implementation.The options earlier were .hbx, .dic, .txt. It will save you a lot of time to create disctionaries manually. @@ -170,12 +188,12 @@ 2012-08-27 17:32 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/editor.prg * contrib/hbide/main.prg - + Implemented: display of code fragment of an identifier - in a separate window. This small display editor is powered - with syntax highliting, opens new window 10/20 pixels away + + Implemented: display of code fragment of an identifier + in a separate window. This small display editor is powered + with syntax highliting, opens new window 10/20 pixels away in x/y coordinates with same window size of the last opened. There is no limit to the open windows. These windows have - Qt_Sheet attribute set, so will always remain floated + Qt_Sheet attribute set, so will always remain floated on top of the main window. To activate: @@ -185,10 +203,10 @@ 4. Adjust the position and size of the window. 5. Next window will open 10/20 pixels away from this window. - This is a productivity tool. At times we need reference from + This is a productivity tool. At times we need reference from other functions and switch forth and back in the editing instances. - With this feature you can keep frequently referenced identifier, - i.e., function/method/class/procedure within viweing without + With this feature you can keep frequently referenced identifier, + i.e., function/method/class/procedure within viweing without leaving the current editing instance. 2012-08-27 21:59 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) @@ -267,7 +285,7 @@ * contrib/hbide/tags.prg + Added: icons to represent the type of identifier in . The following four types are considered: - 1. Class 2. Method 3. Procedure 4. Function + 1. Class 2. Method 3. Procedure 4. Function STATIC FUNCTION/PROCEDURE is considered normal FUNCTION/PROCEDURE. 2012-08-26 17:46 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) @@ -285,7 +303,7 @@ to a contained string. The activation is selected-text toolbar icon . This activation presents a input dialog to provide string to align-at. The following illustration will make it clear: - + abc := 212 bcdefg := 323 a := 413 @@ -309,21 +327,21 @@ * contrib/hbide/saveload.prg * contrib/hbide/setup.ui + Implemented: . - This toggle the selected-text toolbar to appear as soon as + This toggle the selected-text toolbar to appear as soon as selection process starts. + Enhanced: Selected-text toolbar orientation for column-selection mode. - It is now verutical and is positioned 30 pixels to the right of - selected rectangle. Also toolbar never leaves the top and bottom + It is now verutical and is positioned 30 pixels to the right of + selected rectangle. Also toolbar never leaves the top and bottom edges of editing-instance's viewport. 2012-08-24 22:31 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/docks.prg * contrib/hbide/edit.prg * contrib/hbide/editor.prg - ! Refined: selected-text's in-line toolbar; its positioning and + ! Refined: selected-text's in-line toolbar; its positioning and the actions which bring it up and hide. Now toolbar has title-bar - and X button, and is positioned in the center of the + and X button, and is positioned in the center of the editing-instance horizintally. Vertical it follows the cursor position but one line down. @@ -333,9 +351,9 @@ * contrib/hbide/main.prg + Implemented: in-place toolbar of actions belonging to selected text. The moment selection of text is initiatiated, either via keyboard - or mouse, a highlighted toolbar will follow the current cursor + or mouse, a highlighted toolbar will follow the current cursor position containing actions pertaining to selected text. The toolbar - will hide itself as soon as selection process is over. This seems + will hide itself as soon as selection process is over. This seems to be natural as such but opinions are welcome. Also I foresee some other attributes which can be implemented on this protocol, which may follow in next commits. @@ -465,16 +483,16 @@ 2012-08-23 18:57 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp * Optimizations: pair-matching of Harbour control structures - shifted to C++ level and made in-line, no need to click - on the keywords. Pairs are highlighted while navigaing the + shifted to C++ level and made in-line, no need to click + on the keywords. Pairs are highlighted while navigaing the source. This is spontaneous. ! Tab key to behave differently while in column-selection mode. Before tab spaces were inserted at the last column selected, now it is first column selected, which is the normal behavor. - % While in selection mode, pair-matching is disabled, giving - us speed advantage. + % While in selection mode, pair-matching is disabled, giving + us speed advantage. - Removed: PRG block call on QEvent_MouseButtonPress. @@ -487,8 +505,8 @@ 2012-08-22 19:03 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp ! Refined: the way bookmarks were published. Now line-area's - background is painted with the same color that of bookmark - line, instead of inreasing the width of line-area and painting + background is painted with the same color that of bookmark + line, instead of inreasing the width of line-area and painting a rectangle at the left side. This had two unwanted effects: 1. A flicker of entire editing area, 2. Selection of text by mouse was leaving a weired trail sometimes. @@ -497,15 +515,15 @@ * contrib/hbide/dict.prg * contrib/hbide/edit.prg * contrib/hbide/themes.prg - + Implemented: The concept of for sake of - syntax highlighting and case conversion while editing a + + Implemented: The concept of for sake of + syntax highlighting and case conversion while editing a source. User has the ability to pull keywords from : a. standard text file (.txt), - b. Harbour's symbol collection mechanism knows - as .hbx files, + b. Harbour's symbol collection mechanism knows + as .hbx files, c. a text file with the extension .dic (xMate), d. or any other type of text file ( be careful ). - + Dictionaries can be kept activated/deactivated. The following attributes can be assigned to the keywords: @@ -522,9 +540,9 @@ 3. Lower-cased 4. As published in the dictionary. - All changes in the dictionary management are reflective + All changes in the dictionary management are reflective in next run of HbIDE. The changes cannot be made effective inline. - + ; This commit completes a long-standing and much requested feature. 2012-08-22 09:48 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) @@ -536,7 +554,7 @@ 2012-08-21 10:02 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/actions.prg - - Removed: some options which cannot be implemented, at least + - Removed: some options which cannot be implemented, at least from here. * contrib/hbide/dict.prg * contrib/hbide/saveload.prg @@ -550,18 +568,18 @@ * contrib/hbide/edit.prg * contrib/hbide/saveload.prg - + Advanced: the user-interface elements needed to implement + + Advanced: the user-interface elements needed to implement User-Dictionaries, still a work-in-progress. 2012-08-20 17:01 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/docks.prg * contrib/hbide/edit.prg * contrib/hbide/editor.prg - + Implemented: tooltip on BookMark Buttons. - The tooltip content will be the source line over which - visited bookmark is installed. With many bookmarks active, - one tends to forget which belongs to what and where one - wants to jump. This is very handy visual element in those + + Implemented: tooltip on BookMark Buttons. + The tooltip content will be the source line over which + visited bookmark is installed. With many bookmarks active, + one tends to forget which belongs to what and where one + wants to jump. This is very handy visual element in those situations. 2012-08-20 16:30 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) @@ -578,7 +596,7 @@ 2012-08-20 14:25 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/edit.prg ! Refined: Alignment of assigment opertaor ":=" on previous lines - starting at the same indent position. Now object:variable := + starting at the same indent position. Now object:variable := is also honoured. For example: oError:severity := ES_ERROR @@ -608,28 +626,28 @@ 2012-08-19 17:34 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/hbmk2_qt.hb ! Fixed: the treatment of html compliant ->setToolTip( calls. - It has been tedius because it went unnoticed due to Qt versions + It has been tedius because it went unnoticed due to Qt versions where they always keep on changing the string treatment. This fixes issue reported on users list. 2012-08-19 13:49 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp - ! Reinstated: execution of Mouse events to PRG level. These events - cannot be catched with our existing event handeller, probably + ! Reinstated: execution of Mouse events to PRG level. These events + cannot be catched with our existing event handeller, probably Qt does not propogate them to the widget in QPlainTextEdit(). * contrib/hbide/edit.prg + Implemented: If activated you will experience the following behavior: - IF lThis + IF lThis abc := 200 /* . == editing cursor */ bcdefghijk :=. - ENDIF + ENDIF => IF lThis abc := 200 bcdefghijk :=. - ENDIF + ENDIF You continue: @@ -637,13 +655,13 @@ abc := 200 bcdefghijk := 3044 x :=. - ENDIF + ENDIF => IF lThis abc := 200 bcdefghijk := 3044 x :=. - ENDIF + ENDIF 2012-08-16 23:49 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/tests/browarray.prg @@ -652,42 +670,42 @@ 2012-08-16 18:52 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + contrib/hbqt/tests/browarray.prg - + Added: an array browser which also allows to add data rows - to the existing array. This facilitates the understanding - of HBQAbstractItemModel()'s internal working. This commit - answers to many question posted in the mailing-list and + + Added: an array browser which also allows to add data rows + to the existing array. This facilitates the understanding + of HBQAbstractItemModel()'s internal working. This commit + answers to many question posted in the mailing-list and also directed to my mail-box. 2012-08-15 15:55 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/edit.prg ! Fixed: a nasty side-effect of pair-matching; weired editing behaviour. Now another click will clear the matching but keeping the cursor - position at its previous row/column. You may need to click twice + position at its previous row/column. You may need to click twice to place cursor at desired position if matched/pair is active. 2012-08-15 14:17 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/edit.prg - + Added: class/endclass, function|procedure|method/return to control + + Added: class/endclass, function|procedure|method/return to control structures list, for the purpose of highlighting pairs. - ! Refined: the cuursor position exactly where it should been after + ! Refined: the cuursor position exactly where it should been after highlight operation. 2012-08-15 02:51 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp * Called: on QEvent::MouseButtonPress. For unknown reasons - this event is not being received on PRG level with current + this event is not being received on PRG level with current mechanism [TOBE: investigated]. * contrib/hbide/edit.prg * contrib/hbide/editor.prg + Implemented: highlighting matching control structure. - The supported matches are: + The supported matches are: if/endif; do while/enddo; do case/endcase; switch/endswitch; for/next - ; HOWTO: click on any control strucure keyword as above, this and - its matching pair will be highlighted. Next click will clear the - previous one and initiate the new match. Any key will clear the - current match. + ; HOWTO: click on any control strucure keyword as above, this and + its matching pair will be highlighted. Next click will clear the + previous one and initiate the new match. Any key will clear the + current match. 2012-08-14 23:45 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/edit.prg @@ -702,10 +720,10 @@ * contrib/hbide/edit.prg * contrib/hbide/editor.prg + Implemented: collection of variables while editing the source - and making them available next time that variable is started - to be typed again. Thus collected variable is populated in - Code Completion List of Prototypes and Keywords. This is a - productivity tool and comes handy where one is addict to + and making them available next time that variable is started + to be typed again. Thus collected variable is populated in + Code Completion List of Prototypes and Keywords. This is a + productivity tool and comes handy where one is addict to long variable names. 2012-08-14 16:45 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) @@ -755,15 +773,15 @@ METHOD new() METHOD create() - ENDCLASS + ENDCLASS METHOD new() CLASS abc - RETURN Self + RETURN Self METHOD create() CLASS abc - RETURN Self + RETURN Self 2012-08-13 22:27 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/edit.prg @@ -789,9 +807,9 @@ FUNCTION|function|Function|fUnCtioN . => FUNCTION . - LOCAL + LOCAL - RETURN + RETURN /*....................*/ // User defined separator line // and a blank line after the separator @@ -802,7 +820,7 @@ ! Fixed: undo stack was behaving weired once statement structures were inserted. % Changed: the behaviour of "Embrace Lines on Same Indent", activable - from , not to embrace if + from , not to embrace if immediate next line is empty on. Here is the illustration: ORIGINAL: @@ -812,50 +830,50 @@ bcd += 2 IF bcd > 200 EXIT - ENDIF - ENDDO + ENDIF + ENDDO - DO WHILE .T. + DO WHILE .T. IF . // type IF . ( dot means your cursor ) - abc := 12 // note, there is no blank line in between + abc := 12 // note, there is no blank line in between bcd += 2 // IF . and abc := 12 IF bcd > 200 EXIT - ENDIF - ENDDO + ENDIF + ENDDO - DO WHILE .T. + DO WHILE .T. IF . // Converted to ( dot means your cursor ) abc := 12 bcd += 2 IF bcd > 200 EXIT - ENDIF + ENDIF ENDIF - ENDDO + ENDDO - DO WHILE .T. + DO WHILE .T. IF . // type IF . ( dot means your cursor ) - // note, there is a blank line in between + // note, there is a blank line in between abc := 12 // IF . and abc := 12 - bcd += 2 + bcd += 2 IF bcd > 200 EXIT - ENDIF - ENDDO + ENDIF + ENDDO - DO WHILE .T. + DO WHILE .T. IF . // Converted to ( dot means your cursor ) - ENDIF + ENDIF abc := 12 bcd += 2 IF bcd > 200 EXIT - ENDIF - ENDDO + ENDIF + ENDDO 2012-08-10 23:31 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/saveload.prg @@ -867,18 +885,18 @@ * contrib/hbide/setup.ui + Added: a new page next to . - It holds the user-defined values for next level of + It holds the user-defined values for next level of source editing intellisense. Read below. * contrib/hbide/edit.prg - + Implemented: most of the next level of editing intellisense + + Implemented: most of the next level of editing intellisense points are configurable by the developer. These include: 1. To activate the closing structure of a statements as a whole lot [YES] 2. To toggle IF/ENDIF [YES] ELSE [NO] Embrace Lower Lines [NO] 3. To toggle FOR/NEXT [YES] 4. To toggle DO WHILE/ENDDO [YES] - 5. To toggle DO CASE/ENDCASE [YES] # CASES [3] OTHERWISE [NO] + 5. To toggle DO CASE/ENDCASE [YES] # CASES [3] OTHERWISE [NO] 6. To toggle SWITCH/ENDSWITCH [YES ] # CASES [3] OTHERWISE [NO] EXIT on same line [NO] 7. To toggle ADD CLOSING PARENTHESIS of a function [NO] @@ -901,12 +919,12 @@ 2012-08-09 10:41 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/edit.prg - + Included: qtcore; qtgui; qtnetwork; functions list to be + + Included: qtcore; qtgui; qtnetwork; functions list to be properly cased while writing the code. - ; QUESTION: .hbx files contain upper-cased function list, - the only exception is harbour.hbx where functions are - properly cased. Is there a way to get .hbx(es) with + ; QUESTION: .hbx files contain upper-cased function list, + the only exception is harbour.hbx where functions are + properly cased. Is there a way to get .hbx(es) with properly cased functions ? 2012-08-08 19:56 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) @@ -914,7 +932,7 @@ + Implemented: auto insertions of statements closing structure. IF, FOR, DO CASE, DO WHILE, SWITCH The moment you type SPACE after the statement, the next - elements are inserted automatically. The cursor stays at + elements are inserted automatically. The cursor stays at where . is shown: IF . Is it logical to insert ELSEIF ? ENDIF @@ -923,8 +941,8 @@ NEXT DO CASE - CASE . CASE can be configured to - CASE allign the DO CASE indentation + CASE . CASE can be configured to + CASE allign the DO CASE indentation CASE or one more tab to the right. OTHERWISE Also number of CASE stements. ENDCASE @@ -932,8 +950,8 @@ DO WHILE . ENDDO - SWITCH . CASE can be configured to - CASE allign the SWITCH indentation + SWITCH . CASE can be configured to + CASE allign the SWITCH indentation EXIT or one more tab to the right. CASE Also number of CASE stements. EXIT @@ -949,19 +967,19 @@ * contrib/hbqt/qtgui/qth/HBQPlainTextEdit.qth % Changed: the way function prototype was being displayed. It now take use of QToolTip() instead of QWidget/QLabel - combination tied to editor's viewport. + combination tied to editor's viewport. 2012-08-08 12:44 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) - contrib/hbide/hbfunc.txt - Removed: hbfunc.txt * contrib/hbide/edit.prg - % Applied: harbour.hbx instead of hbfunc.txt provided listing + % Applied: harbour.hbx instead of hbfunc.txt provided listing of Harbour core functions. Thanks Viktor for the tip. TODO: set right the camel casing of some function groups, for example, dbSetOrder => DbSetOrder and its group. - + 2012-08-08 10:50 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/edit.prg % Some more synchronization and code clean-up. @@ -970,7 +988,7 @@ 2012-08-07 21:55 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/hbfunc.txt % Extracted: function names from harbour.hbx and applied capitalization - for few groups. I really had never viewed harbour.hbx, an + for few groups. I really had never viewed harbour.hbx, an excellent repository what Harbour contains. 2012-08-07 19:42 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) @@ -989,25 +1007,25 @@ * contrib/hbide/editor.prg * contrib/hbide/saveload.prg + Implemented: auto case conversion of Harbour functions as per - disctionary which is contained inside HbIDE executable as a - resource. + disctionary which is contained inside HbIDE executable as a + resource. + Implemented: auto-tab placement based on the Harbour keyword. - So if you start typing a keyword, say at col 4, and tab-spaces - are set to 3, then that keyword will automatically placed at + So if you start typing a keyword, say at col 4, and tab-spaces + are set to 3, then that keyword will automatically placed at column 3. + Implemented: logical text operators to be converted to uppercase. These are .OR. .AND. .NOT. .F. .T. - NOTE: this commit also improves the speed of editing, plus corrects - the function names as per Harbour standards. So if a Harbour - function is called you need not to pay attention in which way + NOTE: this commit also improves the speed of editing, plus corrects + the function names as per Harbour standards. So if a Harbour + function is called you need not to pay attention in which way you are writing. You simply need to remember that opening brace - must follow the end of function which triggers the corrective + must follow the end of function which triggers the corrective action. Regression is possible to some extent, please report. You can also forward suggessions to improve the editing part. - + 2012-08-06 17:09 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/sources.prg % Remoded: redundant code parts and organized with more options. @@ -1018,14 +1036,14 @@ + Added: class QToolTip(). Note that this class is usable from within QEvent_ToolTip signal which will post QHelpEvent() object like: oWidget:connect( QEvent_ToolTip, {|oEvent| ::execEvent( QEvent_Help, oEvent ) } ) - Then + Then METHOD myClass:execEvent( nEvent, oEvent ) LOCAL oToolTip - IF oEvent:type() == QEvent_ToolTip + IF oEvent:type() == QEvent_ToolTip oToolTip := QToolTip() oToolTip:showText( oEvent:globalPos(), "some other text" ) RETURN .T. /* To stop the event chain */ - ENDIF + ENDIF RETURN .F. 2012-08-04 21:56 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) @@ -1033,8 +1051,8 @@ + Implemented: removal of a editng panel with confirmation. All modified sources will be confirmed to be saved if modified before a panel is removed. - ! Fixed: if order has not been changed, alert message requesting - re-loading HbIDE will not be displayed. Before the message was + ! Fixed: if order has not been changed, alert message requesting + re-loading HbIDE will not be displayed. Before the message was displayed in every click on button. 2012-08-04 00:51 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) @@ -1046,7 +1064,7 @@ * contrib/hbide/saveload.prg * contrib/hbide/tools.prg + Implemented: 1. to reorder editing panels : drag & drop mechanism - 2. to define panel tabs shape : rounded | triangular + 2. to define panel tabs shape : rounded | triangular 3. to define panel tabs position : top | left | bottom | right Activation is through icon on top-toolbar of editing area. @@ -1061,7 +1079,7 @@ * contrib/hbide/edit.prg * contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp ! Fixed: tab key was misbehaving on an empty line. - ! Fixed: while in column mode, if the original text cursor was + ! Fixed: while in column mode, if the original text cursor was before logical cursor, insertion of any key was clearing the selection. An annoying bug it was. @@ -1087,7 +1105,7 @@ % use core API instead of inferior local implementation * ChangeLog - ! fixed mistyped ChangeLog entry headers in previous + ! fixed mistyped ChangeLog entry headers in previous two commits 2012-08-01 14:08 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) diff --git a/harbour/contrib/hbide/resources/align_at.png b/harbour/contrib/hbide/resources/align_at.png index ecca8eeac99a0fc835483da8a049815fece2b24b..5d20a770e910e24f9ec4d9d7be8a73fe74dbe1e9 100644 GIT binary patch delta 890 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 Y0Q-}Uhb!8XIsgCw07*qoM6N<$f=&6PvH$=8 diff --git a/harbour/contrib/hbide/resources/dc_class.png b/harbour/contrib/hbide/resources/dc_class.png index fe97786a41dacdae2b59b3055a7e32c72229c43c..480f78c2205b829a8ce609ad93cf88dee8cd1631 100644 GIT binary patch delta 411 zcmV;M0c8Hl1hfN?BYy#VNkl5pcS|R zXK)#$48SckLz1#9IVYb54n3gE;Pj`Y9m^-NG~NCOUw6Mt-nSdo?#{)nWVRoo@w z9iD?f{pj@qGl8&J`S}i~2?(%Y0%1)+ zY_Q(}V_sp7C%y%T1IJIYo9hc02KG0o+}!s;NIx)}PkE0m3p3t|xAy}0(8_oAA_wfb z*MC5-43RE-m4C0Sk`Gx5S(bO2-tOWT4*rkD)%{p;PRDQYI4%6%+JNAB2cak)M2ZH1 zG0!<2dyKKB++q#3_bs3hgLABQPtjP7Q&Ob>iV+Otu0>guc)BvKc_xQ-R>9l?1Yxg{ z0R78zfh0CH*O?40p9uqshW&?SPicADo&*wtkF^yE&J?pgGC{>o1I_>d002ovPDHLk FV1j)Cy)^&; delta 562 zcmV-20?qxj1Ih%DBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi z!vFvd!vV){sAK>D0pCePK~z{r?N-5U!!Qh#8oB5r3uFN=kY_*r_190o-M|}o1+S19 z@+|r+kS#Jq2M7W|wx15#<^s1cquhjQ`)!&kPI;PPu}j@qWaB{DPtdpA8tR z0a^wrd26lgR0+nlnpVMI74wyxSN{jMS$YFbCL-!Y@nUtQ9-uy)T`-F;^Uh`aK7R_| zh!=GM_x(d_e(bY3KqfoxQwjz>Ai@F`FgyEdzHMzj?|%wDrQBLaEthLV#@dRQa7|dz zH$2v|N6&9T&QX(!Z?I+!D2D-|K_MW@fr>6H*YdvKqi1g4a8|9uSw)R1-m^vog0cwe zwh`2`(I+gCQ7|@h1n)f6chff(87}-5t978JN_D;OHuGxUc zMcw-MzAYyI|IfX?*lns%Vf?QP$|^Y)M#)X`i#$%;Ruiu2xu{^c;iWO7Bg@=Zvr3!i zMAf$_q<+zmuo6@gxZGv1_<%;`s)*8i#SsVZw5ez?pWVZ{@A>1t#Z~pIOu0-ZUD)2*ss!H^>^iNRrbD+ z_fOwV3yBJ>aDTjUl}|>RtSztHf=8AfvpKsAw2rHM(A|Bw{nVl*O#j5UW$o;fef=mQ z{?og!1v@|7x%<-MU}9^``J_WT8B9G6G0JQc*$~FRqxaC(obcAtXt@&`l#dl|*>ijH dUJ?6;{JaYV7;Qe~=mJBJ!PC{xWt~$(69BLpu#*4) delta 640 zcmV-`0)PF>1C9ld8Gi-<0047(dh`GQ00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E z000SaNLh0L01m?d01m?e$8V@)0006bNklNNK$AwA^qW5__e9SfjAEl8ty*G2&n(aM?u z8zY^!TSTPmKz{?^V&&pg=?WHXfPQp9TYC)er6Qa|P6I{#jAX!3s3PkDfFW!+(j5Rm z(Ez%NK3D@BCC>vCCOd3vITw`7*!-Jn?kQBp8}v3p=8sC16Y&TuqT=6H7igqhI z#nw(#3gB3eTsaG58eEFp$bMP-N%XS7;6M+f7q=e{6Mt?$yVNimwAV}9uNx{>yGQe?7ye`6ae2PLMrOK`!6i+5)*X#&js>L zlBE5l3+=u$8?`084jEoIi(q&Zx}$<;C}}M5oUA&k z9m_;8KzWLErLuJA3mLV2cE4GF{sUacQgL zBS44E5dGG;q(IV!K!)g+R*3}Jv;M;)qo4kGek+!TYwz8FN`=-zY3$Q4m^nfXD2b`_ z!JxLr&(B*7`nz%cv9o!K#m~j_`Q?W>-#)$rrXTC?_Us5rUp{O!d=Fd+V3XO?bo#yz zgsJ;yF=@j`!f1(*2s4kOi!!b}S9YDUTSPzdw~U$fu%{^_Z%`vkhUn^gMbdge#Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi z!vFvd!vV){sAK>D0kKI$K~z{r?Uv1L!!Qhm1NiC%xBog6!gT17gn_`Y(y!?k z<}7DuPWlxEP`tiRq1W>dz1=gMm;JfS0HFW>xXL!=ynXqqGk?GMCL>dFm$X%S`AEec z(5~n`An&!v%qcomRn<0{DP~LWhm_&9q1@Y`+u8PS)_iC_cykYYjvSB60RS1gAoO{2 zaamWLi)5gLg1-@TBd+B8$hb51blm~y-snlVV-OQ<-5XX$h#FbsU;;Vh=@XohrU#Eh zm~ov^02uT}l6l&AF!w$%H}^gC0mPHeQ=L%|_su_L;0Gsx{*J~(nydf-002ovPDHLk FV1l16?Dzlx diff --git a/harbour/contrib/hbide/resources/dictionary.png b/harbour/contrib/hbide/resources/dictionary.png index 4bf557784aeaedc0033651d1fc47a1fe4cdb3a44..e57abd527767ac5f0198ee629e38a6364dbeacaf 100644 GIT binary patch delta 1134 zcmV-!1d;p63W5ocBYy-*NklNuI}mSo}ccPkq8pNfH9zu7=wW^ zYzT>AA&JCjaA8EFZV1GkJ6)R?T^UUbVWXqQgqXNdF(Ja}f&~eG5f&g2{^kb;W~RHU z-o3}vtEwKFcBMB}ea`Dwx!GJlUqs79!7#vGKbT8&Fy{qxRQ1HiQ&0D`co3vJLjbjyfNqzC|n0>JXT z)#sgQap(JiM3Ka9sBaIFNb5Qu`Rw6~ASvzLZz8yU1@*~aB;Vvhi{_H~Y#+b~l+v<3 zfF?F#?Kri}e! zT_Xnhote9wV}SwrqsB^2 zw9y}tvgOpFOWyn}YSXuYUAq7g@a9c~To|G(S}+EaF0BSq1kD)Cnf;UUwY{h>igcp)PL9Cpw?`lJ$)zrIMcj=M#~>lmzYn` z6#b`Yv7OW^aA2)2;qI5QXa+4;1@rd-2;5_9q&_``((7-?+>sx!?7)7M_a8)f`?kav zFQT+#Cz6YoMei>lRv9e-QkY*iJ%4sc;|&0~G)IC(i4#-)^twc0|yF@5aJzKco9-y05TOZB2_3;FK{Zo5q-CAOAsrnB`cx#4M2L7 z2Rf-V5#H*fcFHlhzeN#{{wFUCx1az!*B>d2EgMh!p`3}f|BQh%$pbe*^SFX zNbwCb7=#7^1!By+A_zw|udm?JZ}5P{*G)M}WK~nD_8AURIh@fjED-X$sNU9~dHg&Vq-Q*+3k7o{S z*|zmoxm->GEb{O3c~k|Z7(eVQl}hQ*;lrZ<<~*PrhVhq&zWVI3CRkOBYy=DNkl-2qMkspfJk^?6adNy4~Bf$mI4|) zpg{>56d9j0zQ^YXfgq#t;m89&o``z@*Q%c`iWKCX!(?18aE!>@&KgH&?F@qoYXii< zU>effL%9zgX@B_31GrlA%)H3ttfQDpq7=aQ&{n{>8p<6LNk1Q&wO6B6?&zs>@da3r7fi{4Oe{$s5mQF&W%2m{7?V`COLK%1>9-RYeUa_jv#< zmE~JP3ft@exFLF31qNC!fVyrYxqVvQdJG)+dZI`KMUsFxj;YPA?^i)BjB4_0Q%WR zo{a+0Pj*1prgwn!_6TKqnzngX)9Lp;fabEYFUR;;t#x(;pzsM|_=9MiKL=!dCdt|Q z0rtK1CQ*7~yw3`lGfP3eH;>u2ju?l&L*Kjw5ScX-dfwYYSTcp#+qXg2?!6@S`y~O0 zYufI)7n^H6fTmfc$I@A9t_3j1WkGoUT#`6&0OgGX5|}XqLu=NOuC*`Xn3c zO+7SnimW~Bi#KwsEsN4xqO5)s21I1d2Y;cqp9lmlEWXlI>;W7tD7uwy>Jvtm>~Egk zbtkCwc|g|+kg!yOK==EvS6ywq&joy+U#z4n(5+EptXF}&*E}!*yWLEPa1;D<lQ8zlrOF9oHoBSiuV6v(MY?+ z4#ky59828c5G=p5voq1w(mG*9P4$3yHD}CS86UpA>3l_P^;9=!kZ1l5-&G)k%K4ps zEEY31zFIfs*oose#m?k$S;2{8GuIRp6g7jRXJy002ovPDHLkV1hJCc@+Qv diff --git a/harbour/contrib/hbide/resources/editor.png b/harbour/contrib/hbide/resources/editor.png index 227d844c231f40f30c7ac2eec5fd6cb19dd82b7e..9e8531b907643495e23edb34f16588de1ed5e879 100644 GIT binary patch delta 764 zcmVu%aW5QY1r{aLAh+V|)yw9lA8(uc@JeVGKv zg>bjI7>vP~WICUdRn3YC`=@lIBkvxcnR7N?A?1VC$E&NW-`CgIa(Q`q6ySv?-URpz zaqPkqZvuQJ71g@Cf5rWS+&?^)xYM=Ad9ZXgN8yP#0lv8a?tf*u*2Z?HD-VzD9qviF z_ETpEkL@RPdwOjSPrP>mxR>McSkBJQr8gL2u*3D0>vVersX{|^4)*r?12{VXFI%lU zsn^fs{QQ>;h9l|r`lRsV4fWS0fT%ro39s>n>?M&B#PpF9NI&`!wxWtB8lQye2ga(nIMm#9Xyvtqlvh@VCgcGWWFH%4mV5Ys!ghZLwBeb ztsNlIA&W&SS+)Y@dagq}4xNuT-O}&%Ika{F8k}L8E_qs9#WZ!Czqh#e0;J-KPvKGr za-rB4;D16WPDsUZRDQQS-^g;Ag>v)0D-UrtaUKhFkF%AVD`C!wc8uIP}l(& zVjYgD2hU;D2n9twB|TYT6IN$&ICF;z_WhSo12E5oYdT4PDfJ} z0Xh@t>;Nw>FH$M?H25Guh|ccy1Ms6@6vKUl>g-_m0%|8Vmc;V>+ ud{KN?{80Qn3h=@cZ>>)(NONR-!TS#gLj+=60~2fj0000hK_F6bY_7>4Tfm3eS@^NLtM4s0W)Q0&CLD|_g3EQWA!1_-uymkg z6*pHCNa1~i*OaUr%wG+9=H}Y?)Oe6CAk~mS#%vYl0bNT>T3=g*wbd2q-rvW4#Alz^ z*EHVic4JI1xeP{gWES8OYvdy$wKX>ahe$rg<};qz0)H-m?$6I#aC%yg8INqI$$Tsl zuT#-<0g`9<$HfKMJJ{Gc6ON)ze)49>TCB~PRmNeFBcUUd3*EWvJwU{qNtP-}{?L^JY z;38-jB@AaOMqt(s8lK|ED1H!J%w{IpK!^J7-3vOzW6td`7MyX z6qiaxC>H17^72x@H6?Huy#?V{S63sH4j|Y=D}X3geoDS{XBy( zfX1(wgj!ev+6&}lj0B8|SNRptm4xMLwW`l)y@v<&`1GXu*tGs|pdKC{9c-Zb10PG` zy1ia*C!;xO?$G}vl-W9kyK$QB*p|-4$viU5osj*nV0wBQ3WWl+E`FQdYLS0NBrfhX zyMH08gxA*zxnl9)Rc}%p=M&F_XJ-wggphgk${WYo#Ph)R_Lg>6Ot``G#^ox&RX9J` zU$U3PjVr+ZhHmfkRQ$hjKHqE$?v9U-i}v90mgcP1o&EF|&^PJi_3X_2c1CY`L;tbS nga!0D^eK2>dqTheC%^zP<-#TlQWo3*015yANkvXXu0mjf0~fs2 diff --git a/harbour/contrib/hbide/resources/launch_r.png b/harbour/contrib/hbide/resources/launch_r.png index cb777413ba2a8ea2e0e31aa1df298dafa0ec26c1..020bb66d5021953270f19c550aa216e6c8ed3624 100644 GIT binary patch delta 1289 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 diff --git a/harbour/contrib/hbide/resources/stringify.png b/harbour/contrib/hbide/resources/stringify.png index 2ce1ebb7bae5f2015139a1603f7b733c8d626d57..ad039ea76d4a1f02e3fba62eb1a82ce4bb38ea85 100644 GIT binary patch delta 127 zcmV-_0D%AX0h|GlBzR*vDKmnh0D)p9X91R6!QY?c zbZbgm>nj_12nPWfY}f#7WO*wD$R9;A4B21?o>!{{0lt+0`t!j6(8K!xZ*u}rII|KU h0l<~uaBCcLe=18BOHsSo(qaGr002ovPDHLkV1irJFtz{y delta 217 zcmV;~04D#O0rdfpB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pFib+I4R5(wqk--gsFbo5`{}PPCC_H&G0$>!QV5I>9m3Tyr?~>Bm zPiNjat9@gI`6&z`0E3xJ({KX9Q0pqF*$2txD1g&wA0V7C1yTTrgTP{DTD|OqL@V%8 ztzE!miKrnH95IIdBl;b00ov?=3Jq8A01Ybu_k3jiOWj(nktBtctV(=seYD>OOBPE} TW#m&w00000NkvXXu0mjfMG;dA diff --git a/harbour/contrib/hbwin/hbwin.hbx b/harbour/contrib/hbwin/hbwin.hbx index a94e0abdab..965c2bf28d 100644 --- a/harbour/contrib/hbwin/hbwin.hbx +++ b/harbour/contrib/hbwin/hbwin.hbx @@ -350,6 +350,7 @@ DYNAMIC WIN_OSIS2000 DYNAMIC WIN_OSIS2000ORUPPER DYNAMIC WIN_OSIS2003 DYNAMIC WIN_OSIS7 +DYNAMIC WIN_OSIS8 DYNAMIC WIN_OSIS95 DYNAMIC WIN_OSIS98 DYNAMIC WIN_OSIS9X diff --git a/harbour/contrib/hbwin/win_osc.c b/harbour/contrib/hbwin/win_osc.c index 4f809c7edc..e7e6be406f 100644 --- a/harbour/contrib/hbwin/win_osc.c +++ b/harbour/contrib/hbwin/win_osc.c @@ -138,6 +138,13 @@ HB_FUNC( WIN_OSIS7 ) hb_retl( osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 1 ); } +HB_FUNC( WIN_OSIS8 ) +{ + OSVERSIONINFO osvi; + getwinver( &osvi ); + hb_retl( osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 2 ); +} + HB_FUNC( WIN_OSIS9X ) { OSVERSIONINFO osvi; diff --git a/harbour/contrib/xhb/xhb.hbx b/harbour/contrib/xhb/xhb.hbx index 8d8dca2664..a89fa6f1fd 100644 --- a/harbour/contrib/xhb/xhb.hbx +++ b/harbour/contrib/xhb/xhb.hbx @@ -329,6 +329,7 @@ DYNAMIC OS_ISWIN2000 DYNAMIC OS_ISWIN2000_OR_LATER DYNAMIC OS_ISWIN2003 DYNAMIC OS_ISWIN7 +DYNAMIC OS_ISWIN8 DYNAMIC OS_ISWIN95 DYNAMIC OS_ISWIN98 DYNAMIC OS_ISWIN9X diff --git a/harbour/contrib/xhb/xwin_ver.c b/harbour/contrib/xhb/xwin_ver.c index 79b6067486..ff35c17bdd 100644 --- a/harbour/contrib/xhb/xwin_ver.c +++ b/harbour/contrib/xhb/xwin_ver.c @@ -66,6 +66,7 @@ HB_FUNC_EXTERN( WIN_OSIS2003 ) ; HB_FUNC( OS_ISWIN2003 ) { HB_ HB_FUNC_EXTERN( WIN_OSISVISTA ) ; HB_FUNC( OS_ISWINVISTA ) { HB_FUNC_EXEC( WIN_OSISVISTA ); } HB_FUNC_EXTERN( WIN_OSISVISTAORUPPER ) ; HB_FUNC( OS_ISWINVISTA_OR_LATER ) { HB_FUNC_EXEC( WIN_OSISVISTAORUPPER ); } HB_FUNC_EXTERN( WIN_OSIS7 ) ; HB_FUNC( OS_ISWIN7 ) { HB_FUNC_EXEC( WIN_OSIS7 ); } +HB_FUNC_EXTERN( WIN_OSIS8 ) ; HB_FUNC( OS_ISWIN8 ) { HB_FUNC_EXEC( WIN_OSIS8 ); } HB_FUNC_EXTERN( WIN_OSIS9X ) ; HB_FUNC( OS_ISWIN9X ) { HB_FUNC_EXEC( WIN_OSIS9X ); } HB_FUNC_EXTERN( WIN_OSIS95 ) ; HB_FUNC( OS_ISWIN95 ) { HB_FUNC_EXEC( WIN_OSIS95 ); } HB_FUNC_EXTERN( WIN_OSIS98 ) ; HB_FUNC( OS_ISWIN98 ) { HB_FUNC_EXEC( WIN_OSIS98 ); } @@ -88,6 +89,7 @@ HB_FUNC( OS_ISWIN2003 ) { hb_retl( HB_FALSE ); } HB_FUNC( OS_ISWINVISTA ) { hb_retl( HB_FALSE ); } HB_FUNC( OS_ISWINVISTA_OR_LATER ) { hb_retl( HB_FALSE ); } HB_FUNC( OS_ISWIN7 ) { hb_retl( HB_FALSE ); } +HB_FUNC( OS_ISWIN8 ) { hb_retl( HB_FALSE ); } HB_FUNC( OS_ISWIN9X ) { hb_retl( HB_FALSE ); } HB_FUNC( OS_ISWIN95 ) { hb_retl( HB_FALSE ); } HB_FUNC( OS_ISWIN98 ) { hb_retl( HB_FALSE ); }