diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 9c3d6fdbf1..a85106eec2 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,25 @@ The license applies to all entries newer than 2009-04-28. */ +2012-11-06 19:03 UTC+0100 Viktor Szakats (harbour syenar.net) + * contrib/gtwvg/gtwvg.hbx + * contrib/hbct/hbct.hbx + + formatted function names in .hbx files + + * contrib/gtwvg/gtwvg.c + * contrib/gtwvg/hbgtwvg.ch + * contrib/gtwvg/wvgcore.c + * contrib/gtwvg/wvgcuig.c + * contrib/gtwvg/wvgparts.ch + * contrib/gtwvg/wvgutils.c + * contrib/gtwvg/wvgwin.c + * contrib/gtwvg/wvgwing.c + * contrib/gtwvg/wvtwin.ch + * contrib/gtwvg/gtwvg.hbx + * various formatting cleanups + ! moved WVG_GTINFOEX() outside the GT code + * excluded GT driver puller symbols from .hbx + 2012-11-06 17:31 UTC+0100 Viktor Szakats (harbour syenar.net) * contrib/hbfimage/fi_winfu.c ! fixes to previous modification diff --git a/harbour/contrib/gtwvg/gtwvg.c b/harbour/contrib/gtwvg/gtwvg.c index 40b879e4b7..2221053138 100644 --- a/harbour/contrib/gtwvg/gtwvg.c +++ b/harbour/contrib/gtwvg/gtwvg.c @@ -2372,7 +2372,7 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara return DefWindowProc( hWnd, message, wParam, lParam ); } -static HB_BOOL hb_gt_wvt_IsDialogMessage( PHB_GTWVT pWVT, LPMSG lpMsg ) /* Proprietory to GTWVG */ +static HB_BOOL hb_gt_wvt_IsDialogMessage( PHB_GTWVT pWVT, LPMSG lpMsg ) /* Proprietary to GTWVG */ { int iIndex; @@ -4609,32 +4609,3 @@ PHB_GTWVT hb_wvt_gtGetWVT( void ) } return pWVT; } - -/*-*/ - -HB_FUNC( WVG_GTINFOEX ) -{ - if( HB_ISPOINTER( 1 ) && HB_ISNUM( 2 ) ) - { - PHB_GT pGT = hb_gt_ItemBase( hb_param( 1, HB_IT_ANY ) ); - - if( pGT ) - { - HB_GT_INFO gtInfo; - - gtInfo.pNewVal = hb_param( 3, HB_IT_ANY ); - gtInfo.pNewVal2 = hb_param( 4, HB_IT_ANY ); - gtInfo.pResult = NULL; - - HB_GTSELF_INFO( pGT, hb_parni( 2 ), >Info ); - hb_gt_BaseFree( pGT ); - - if( gtInfo.pResult ) - hb_itemReturnRelease( gtInfo.pResult ); - } - } - else - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); -} - -/*-*/ diff --git a/harbour/contrib/gtwvg/gtwvg.hbx b/harbour/contrib/gtwvg/gtwvg.hbx index d3333df699..4b88ea5a96 100644 --- a/harbour/contrib/gtwvg/gtwvg.hbx +++ b/harbour/contrib/gtwvg/gtwvg.hbx @@ -27,344 +27,345 @@ #command DYNAMIC => EXTERNAL #endif -DYNAMIC TBROWSEWVG -DYNAMIC WVG3STATE -DYNAMIC WVGACTIVEXCONTROL -DYNAMIC WVGBITMAP -DYNAMIC WVGCHECKBOX -DYNAMIC WVGCOMBOBOX -DYNAMIC WVGCRT -DYNAMIC WVGDATAREF -DYNAMIC WVGDIALOG -DYNAMIC WVGDRAWINGAREA -DYNAMIC WVGFONT -DYNAMIC WVGFONTDIALOG -DYNAMIC WVGHTMLVIEWER -DYNAMIC WVGLISTBOX -DYNAMIC WVGMENU -DYNAMIC WVGMENUBAR -DYNAMIC WVGMLE -DYNAMIC WVGPARTHANDLER -DYNAMIC WVGPUSHBUTTON -DYNAMIC WVGRADIOBUTTON -DYNAMIC WVGSCROLLBAR -DYNAMIC WVGSETAPPWINDOW +DYNAMIC TBrowseWVG +DYNAMIC WVG3State +DYNAMIC WVGActiveXControl +DYNAMIC WVGBitmap +DYNAMIC WVGCheckBox +DYNAMIC WVGComboBox +DYNAMIC WVGCrt +DYNAMIC WVGDataRef +DYNAMIC WVGDialog +DYNAMIC WVGDrawingArea +DYNAMIC WVGFont +DYNAMIC WVGFontDialog +DYNAMIC WVGHtmlViewer +DYNAMIC WVGListBox +DYNAMIC WVGMenu +DYNAMIC WVGMenuBar +DYNAMIC WVGMle +DYNAMIC WVGPartHandler +DYNAMIC WVGPushButton +DYNAMIC WVGRadioButton +DYNAMIC WVGScrollBar +DYNAMIC WVGSetAppWindow DYNAMIC WVGSLE -DYNAMIC WVGSTATIC -DYNAMIC WVGSTATUSBAR -DYNAMIC WVGSTATUSBARPANEL -DYNAMIC WVGSYSWINDOW -DYNAMIC WVGTABPAGE -DYNAMIC WVGTOOLBAR -DYNAMIC WVGTOOLBARBUTTON -DYNAMIC WVGTREEVIEW -DYNAMIC WVGTREEVIEWITEM -DYNAMIC WVGWINDOW -DYNAMIC WVG_ADDTOOLBARBUTTON -DYNAMIC WVG_AND -DYNAMIC WVG_APPENDMENU -DYNAMIC WVG_BEGINMOUSETRACKING -DYNAMIC WVG_BOXGET -DYNAMIC WVG_BOXGROUP -DYNAMIC WVG_BOXGROUPRAISED -DYNAMIC WVG_BOXRAISED -DYNAMIC WVG_BOXRECESSED -DYNAMIC WVG_BRINGWINDOWTOTOP -DYNAMIC WVG_BUTTON_GETCHECK -DYNAMIC WVG_CALLWINDOWPROC -DYNAMIC WVG_CHECKDLGBUTTON -DYNAMIC WVG_CHECKMENUITEM -DYNAMIC WVG_CHECKRADIOBUTTON -DYNAMIC WVG_CHOOSECOLOR -DYNAMIC WVG_CHOOSEFONT -DYNAMIC WVG_CHOOSEFONT_GETLOGFONT -DYNAMIC WVG_CLEARGUIOBJECTS -DYNAMIC WVG_CLIENTTOSCREEN -DYNAMIC WVG_COLORRECT -DYNAMIC WVG_CREATEBRUSH -DYNAMIC WVG_CREATEMENU -DYNAMIC WVG_CREATEPOPUPMENU -DYNAMIC WVG_CREATETOOLTIPWINDOW -DYNAMIC WVG_CREATEWINDOWEX -DYNAMIC WVG_DEFWINDOWPROC -DYNAMIC WVG_DELETEMENU -DYNAMIC WVG_DELETEOBJECT -DYNAMIC WVG_DELPAINT -DYNAMIC WVG_DESTROYMENU -DYNAMIC WVG_DESTROYWINDOW -DYNAMIC WVG_DRAWIMAGE -DYNAMIC WVG_DRAWMENUBAR -DYNAMIC WVG_DRAWTEXT -DYNAMIC WVG_ELLIPSE -DYNAMIC WVG_ENABLEMENUITEM -DYNAMIC WVG_ENABLEWINDOW -DYNAMIC WVG_FILLRECT -DYNAMIC WVG_FINDWINDOW -DYNAMIC WVG_FONTCREATE -DYNAMIC WVG_GETCLIENTRECT -DYNAMIC WVG_GETCURRENTBRUSH -DYNAMIC WVG_GETCURRENTFONT -DYNAMIC WVG_GETCURRENTOBJECT -DYNAMIC WVG_GETDC -DYNAMIC WVG_GETDESKTOPWINDOW -DYNAMIC WVG_GETDIALOGBASEUNITS -DYNAMIC WVG_GETDLGITEM -DYNAMIC WVG_GETDLGITEMTEXT -DYNAMIC WVG_GETFOCUS -DYNAMIC WVG_GETMESSAGETEXT -DYNAMIC WVG_GETNMHDRINFO -DYNAMIC WVG_GETNMMOUSEINFO -DYNAMIC WVG_GETNMTREEVIEWINFO -DYNAMIC WVG_GETPAINT -DYNAMIC WVG_GETSTOCKOBJECT -DYNAMIC WVG_GETWINDOWRECT -DYNAMIC WVG_HEIGHTTOPOINTSIZE -DYNAMIC WVG_HINSTANCE -DYNAMIC WVG_HIWORD -DYNAMIC WVG_IMAGE -DYNAMIC WVG_INSERTMENU -DYNAMIC WVG_INSERTPAINT -DYNAMIC WVG_INVALIDATERECT -DYNAMIC WVG_ISDLGBUTTONCHECKED -DYNAMIC WVG_ISICONIC -DYNAMIC WVG_ISMENUITEMCHECKED -DYNAMIC WVG_ISMENUITEMENABLED -DYNAMIC WVG_ISWINDOW -DYNAMIC WVG_ISZOOMED -DYNAMIC WVG_LABEL -DYNAMIC WVG_LABELEX -DYNAMIC WVG_LBGETCURSEL -DYNAMIC WVG_LBGETTEXT -DYNAMIC WVG_LBSETCURSEL -DYNAMIC WVG_LINE -DYNAMIC WVG_LINEEX -DYNAMIC WVG_LOADICON -DYNAMIC WVG_LOADIMAGE -DYNAMIC WVG_LOWORD -DYNAMIC WVG_MAKELPARAM -DYNAMIC WVG_MESSAGEBOX -DYNAMIC WVG_MOVEWINDOW -DYNAMIC WVG_NOT -DYNAMIC WVG_OBJECT -DYNAMIC WVG_OR -DYNAMIC WVG_OUTLINE -DYNAMIC WVG_OUTLINEEX -DYNAMIC WVG_PICTURE -DYNAMIC WVG_POINTSIZETOHEIGHT -DYNAMIC WVG_POSTMESSAGE -DYNAMIC WVG_PREPAREBITMAPFROMFILE -DYNAMIC WVG_PREPAREBITMAPFROMRESOURCEID -DYNAMIC WVG_PREPAREBITMAPFROMRESOURCENAME -DYNAMIC WVG_PURGEPAINT -DYNAMIC WVG_RECTANGLE -DYNAMIC WVG_REGISTERCLASS_BYNAME -DYNAMIC WVG_RELEASEDC -DYNAMIC WVG_RELEASEWINDOWPROCBLOCK -DYNAMIC WVG_ROUNDRECT -DYNAMIC WVG_SCREENTOCLIENT -DYNAMIC WVG_SELECTOBJECT -DYNAMIC WVG_SENDCBMESSAGE -DYNAMIC WVG_SENDDLGITEMMESSAGE -DYNAMIC WVG_SENDEDITCONTROLMESSAGE -DYNAMIC WVG_SENDMESSAGE -DYNAMIC WVG_SENDMESSAGETEXT -DYNAMIC WVG_SENDTOOLBARMESSAGE -DYNAMIC WVG_SETBKCOLOR -DYNAMIC WVG_SETBKMODE -DYNAMIC WVG_SETCURRENTBRUSH -DYNAMIC WVG_SETDCBRUSHCOLOR -DYNAMIC WVG_SETDCPENCOLOR -DYNAMIC WVG_SETDLGITEMTEXT -DYNAMIC WVG_SETFOCUS -DYNAMIC WVG_SETFOREGROUNDWINDOW -DYNAMIC WVG_SETGOBJDATA -DYNAMIC WVG_SETGOBJSTATE -DYNAMIC WVG_SETLAYEREDWINDOWATTRIBUTES -DYNAMIC WVG_SETMENU -DYNAMIC WVG_SETMENUITEM -DYNAMIC WVG_SETPAINT -DYNAMIC WVG_SETPARENT -DYNAMIC WVG_SETTEXTCOLOR -DYNAMIC WVG_SETTIMER -DYNAMIC WVG_SETTOOLTIPTEXT -DYNAMIC WVG_SETWINDOWLONG -DYNAMIC WVG_SETWINDOWPOSANDSIZE -DYNAMIC WVG_SETWINDOWPOSITION -DYNAMIC WVG_SETWINDOWPOSTOBACK -DYNAMIC WVG_SETWINDOWPOSTOTOP -DYNAMIC WVG_SETWINDOWPROCBLOCK -DYNAMIC WVG_SETWINDOWSIZE -DYNAMIC WVG_SETWINDOWTEXT -DYNAMIC WVG_SETWNDPROC -DYNAMIC WVG_SHADEDRECT -DYNAMIC WVG_SHOWWINDOW -DYNAMIC WVG_SLEEP -DYNAMIC WVG_STATUSBARCREATEPANEL -DYNAMIC WVG_STATUSBARREFRESH -DYNAMIC WVG_STATUSBARSETTEXT -DYNAMIC WVG_TEXTBOX -DYNAMIC WVG_TRACKPOPUPMENU -DYNAMIC WVG_TREEVIEW_ADDITEM -DYNAMIC WVG_TREEVIEW_EXPAND -DYNAMIC WVG_TREEVIEW_GETSELECTIONINFO -DYNAMIC WVG_TREEVIEW_SELECTITEM -DYNAMIC WVG_TREEVIEW_SETBKCOLOR -DYNAMIC WVG_TREEVIEW_SETLINECOLOR -DYNAMIC WVG_TREEVIEW_SETTEXTCOLOR -DYNAMIC WVG_TREEVIEW_SHOWEXPANDED -DYNAMIC WVG_TVIS_EXPANDED -DYNAMIC WVG_UPDATEWINDOW -DYNAMIC WVTBANNER -DYNAMIC WVTBROWSE -DYNAMIC WVTCONSOLE -DYNAMIC WVTDIALOG -DYNAMIC WVTGETS -DYNAMIC WVTIMAGE -DYNAMIC WVTLABEL -DYNAMIC WVTMENU -DYNAMIC WVTOBJECT -DYNAMIC WVTPAINTOBJECTS -DYNAMIC WVTPANEL -DYNAMIC WVTPROGRESSBAR -DYNAMIC WVTPUSHBUTTON -DYNAMIC WVTSCROLLBAR -DYNAMIC WVTSETPAINT -DYNAMIC WVTSTATIC -DYNAMIC WVTSTATUSBAR -DYNAMIC WVTTEXTBOX -DYNAMIC WVTTOOLBAR -DYNAMIC WVTTOOLBUTTON -DYNAMIC WVT_ADDDLGITEM -DYNAMIC WVT_APPENDMENU -DYNAMIC WVT_CBADDSTRING -DYNAMIC WVT_CBSETCURSEL -DYNAMIC WVT_CENTERWINDOW -DYNAMIC WVT_CHOOSECOLOR -DYNAMIC WVT_CHOOSEFONT -DYNAMIC WVT_CLIENTTOSCREEN -DYNAMIC WVT_CORE -DYNAMIC WVT_CREATEDIALOG -DYNAMIC WVT_CREATEDIALOGDYNAMIC -DYNAMIC WVT_CREATEDIALOGMODAL -DYNAMIC WVT_CREATEFONT -DYNAMIC WVT_CREATEMENU -DYNAMIC WVT_CREATEPOPUPMENU -DYNAMIC WVT_DELETEMENU -DYNAMIC WVT_DESTROYMENU -DYNAMIC WVT_DIALOGBOX -DYNAMIC WVT_DLGSETICON -DYNAMIC WVT_DRAWBOXGET -DYNAMIC WVT_DRAWBOXGROUP -DYNAMIC WVT_DRAWBOXGROUPRAISED -DYNAMIC WVT_DRAWBOXRAISED -DYNAMIC WVT_DRAWBOXRECESSED -DYNAMIC WVT_DRAWBUTTON -DYNAMIC WVT_DRAWCOLORRECT -DYNAMIC WVT_DRAWELLIPSE -DYNAMIC WVT_DRAWFOCUSRECT -DYNAMIC WVT_DRAWGRIDHORZ -DYNAMIC WVT_DRAWGRIDVERT -DYNAMIC WVT_DRAWIMAGE -DYNAMIC WVT_DRAWLABEL -DYNAMIC WVT_DRAWLABELEX -DYNAMIC WVT_DRAWLABELOBJ -DYNAMIC WVT_DRAWLINE -DYNAMIC WVT_DRAWLINEEX -DYNAMIC WVT_DRAWMENUBAR -DYNAMIC WVT_DRAWOUTLINE -DYNAMIC WVT_DRAWOUTLINEEX -DYNAMIC WVT_DRAWPICTURE -DYNAMIC WVT_DRAWPROGRESSBAR -DYNAMIC WVT_DRAWRECTANGLE -DYNAMIC WVT_DRAWROUNDRECT -DYNAMIC WVT_DRAWSCROLLBUTTON -DYNAMIC WVT_DRAWSCROLLTHUMBHORZ -DYNAMIC WVT_DRAWSCROLLTHUMBVERT -DYNAMIC WVT_DRAWSHADEDRECT -DYNAMIC WVT_DRAWSTATUSBAR -DYNAMIC WVT_DRAWTEXTBOX -DYNAMIC WVT_DRAWTOOLBUTTONSTATE -DYNAMIC WVT_ENABLEMENUITEM -DYNAMIC WVT_ENABLESHORTCUTS -DYNAMIC WVT_GETCLIPBOARD -DYNAMIC WVT_GETCURSORPOS -DYNAMIC WVT_GETFONTHANDLE -DYNAMIC WVT_GETFONTINFO -DYNAMIC WVT_GETLASTMENUEVENT -DYNAMIC WVT_GETMENU -DYNAMIC WVT_GETOPENFILENAME -DYNAMIC WVT_GETPAINTRECT -DYNAMIC WVT_GETPALETTE -DYNAMIC WVT_GETRGBCOLOR -DYNAMIC WVT_GETRGBCOLORBYSTRING -DYNAMIC WVT_GETSAVEFILENAME -DYNAMIC WVT_GETSCREENHEIGHT -DYNAMIC WVT_GETSCREENWIDTH -DYNAMIC WVT_GETTITLE -DYNAMIC WVT_GETTOOLTIPBKCOLOR -DYNAMIC WVT_GETTOOLTIPTEXTCOLOR -DYNAMIC WVT_GETTOOLTIPWIDTH -DYNAMIC WVT_GETWINDOWHANDLE -DYNAMIC WVT_GETXYFROMROWCOL -DYNAMIC WVT_HIDE -DYNAMIC WVT_INVALIDATERECT -DYNAMIC WVT_ISLBUTTONPRESSED -DYNAMIC WVT_KEYBOARD -DYNAMIC WVT_KILLTIMER -DYNAMIC WVT_LBADDSTRING -DYNAMIC WVT_LBDELETESTRING -DYNAMIC WVT_LBGETCOUNT -DYNAMIC WVT_LBSETCURSEL -DYNAMIC WVT_LOADFONT -DYNAMIC WVT_LOADPEN -DYNAMIC WVT_LOADPICTURE -DYNAMIC WVT_LOADPICTUREFROMRESOURCE -DYNAMIC WVT_MAKEDLGTEMPLATE -DYNAMIC WVT_MAXIMIZE -DYNAMIC WVT_MESSAGEBOX -DYNAMIC WVT_MINIMIZE -DYNAMIC WVT_PASTEFROMCLIPBOARD -DYNAMIC WVT_PROCESSMESSAGES -DYNAMIC WVT_RESETWINDOW -DYNAMIC WVT_RESTSCREEN -DYNAMIC WVT_SAVESCREEN -DYNAMIC WVT_SETALTF4CLOSE -DYNAMIC WVT_SETASNORMAL -DYNAMIC WVT_SETBRUSH -DYNAMIC WVT_SETCLIPBOARD -DYNAMIC WVT_SETCODEPAGE -DYNAMIC WVT_SETDLGCOMODE -DYNAMIC WVT_SETFONT -DYNAMIC WVT_SETGUI -DYNAMIC WVT_SETICON -DYNAMIC WVT_SETLASTMENUEVENT -DYNAMIC WVT_SETMENU -DYNAMIC WVT_SETMENUKEYEVENT -DYNAMIC WVT_SETMOUSEMOVE -DYNAMIC WVT_SETMOUSEPOS -DYNAMIC WVT_SETONTOP -DYNAMIC WVT_SETPALETTE -DYNAMIC WVT_SETPEN -DYNAMIC WVT_SETPOINTER -DYNAMIC WVT_SETPOPUPMENU -DYNAMIC WVT_SETTIMER -DYNAMIC WVT_SETTITLE -DYNAMIC WVT_SETTOOLTIP -DYNAMIC WVT_SETTOOLTIPACTIVE -DYNAMIC WVT_SETTOOLTIPBKCOLOR -DYNAMIC WVT_SETTOOLTIPMARGIN -DYNAMIC WVT_SETTOOLTIPTEXT -DYNAMIC WVT_SETTOOLTIPTEXTCOLOR -DYNAMIC WVT_SETTOOLTIPTITLE -DYNAMIC WVT_SETTOOLTIPWIDTH -DYNAMIC WVT_SETWINDOWPOS -DYNAMIC WVT_SHOW -DYNAMIC WVT_SHOWWINDOW -DYNAMIC WVT_TRACKPOPUPMENU -DYNAMIC WVT_UPDATE -DYNAMIC WVT_UTILS -DYNAMIC WVT_WINDOWCENTRE -DYNAMIC WVT__MAKEDLGTEMPLATE +DYNAMIC WVGStatic +DYNAMIC WVGStatusBar +DYNAMIC WVGStatusBarPanel +DYNAMIC WVGSysWindow +DYNAMIC WVGTabPage +DYNAMIC WVGToolBar +DYNAMIC WVGToolBarButton +DYNAMIC WVGTreeView +DYNAMIC WVGTreeViewItem +DYNAMIC WVGWindow +DYNAMIC Wvg_AddToolbarButton +DYNAMIC Wvg_And +DYNAMIC Wvg_AppendMenu +DYNAMIC Wvg_BeginMouseTracking +DYNAMIC Wvg_BoxGet +DYNAMIC Wvg_BoxGroup +DYNAMIC Wvg_BoxGroupRaised +DYNAMIC Wvg_BoxRaised +DYNAMIC Wvg_BoxRecessed +DYNAMIC Wvg_BringWindowToTop +DYNAMIC Wvg_Button_GetCheck +DYNAMIC Wvg_CallWindowProc +DYNAMIC Wvg_CheckDlgButton +DYNAMIC Wvg_CheckMenuItem +DYNAMIC Wvg_CheckRadioButton +DYNAMIC Wvg_ChooseColor +DYNAMIC Wvg_ChooseFont +DYNAMIC Wvg_ChooseFont_GetLOGFont +DYNAMIC Wvg_ClearGUIObjects +DYNAMIC Wvg_ClientToScreen +DYNAMIC Wvg_ColorRect +DYNAMIC Wvg_CreateBrush +DYNAMIC Wvg_CreateMenu +DYNAMIC Wvg_CreatePOPUPMenu +DYNAMIC Wvg_CreateToolTipWindow +DYNAMIC Wvg_CreateWindowEx +DYNAMIC Wvg_DefWindowProc +DYNAMIC Wvg_DeleteMenu +DYNAMIC Wvg_DeleteObject +DYNAMIC Wvg_DelPaint +DYNAMIC Wvg_DestroyMenu +DYNAMIC Wvg_DestroyWindow +DYNAMIC Wvg_DrawImage +DYNAMIC Wvg_DrawMenuBar +DYNAMIC Wvg_DrawText +DYNAMIC Wvg_Ellipse +DYNAMIC Wvg_EnableMenuItem +DYNAMIC Wvg_EnableWindow +DYNAMIC Wvg_FillRect +DYNAMIC Wvg_FindWindow +DYNAMIC Wvg_FontCreate +DYNAMIC Wvg_GetClientRect +DYNAMIC Wvg_GetCurrentBrush +DYNAMIC Wvg_GetCurrentFont +DYNAMIC Wvg_GetCurrentObject +DYNAMIC Wvg_GetDC +DYNAMIC Wvg_GetDesktopWindow +DYNAMIC Wvg_GetDialogBaseUnits +DYNAMIC Wvg_GetDlgItem +DYNAMIC Wvg_GetDlgItemText +DYNAMIC Wvg_GetFocus +DYNAMIC Wvg_GetMessagetExt +DYNAMIC Wvg_GetNMHdrInfo +DYNAMIC Wvg_GetNMMouseInfo +DYNAMIC Wvg_GetNMTreeViewInfo +DYNAMIC Wvg_GetPaint +DYNAMIC Wvg_GetStockObject +DYNAMIC Wvg_GetWindowRect +DYNAMIC Wvg_gtInfoEx +DYNAMIC Wvg_HeightToPointSize +DYNAMIC Wvg_hInstance +DYNAMIC Wvg_HIWORD +DYNAMIC Wvg_Image +DYNAMIC Wvg_InsertMenu +DYNAMIC Wvg_InsertPaint +DYNAMIC Wvg_InvalidateRect +DYNAMIC Wvg_IsDlgButtonChecked +DYNAMIC Wvg_IsIconic +DYNAMIC Wvg_IsMenuItemChecked +DYNAMIC Wvg_IsMenuItemEnabled +DYNAMIC Wvg_IsWindow +DYNAMIC Wvg_IsZoomed +DYNAMIC Wvg_Label +DYNAMIC Wvg_LabelEx +DYNAMIC Wvg_LBGetCurSel +DYNAMIC Wvg_LBGetText +DYNAMIC Wvg_LBSetCurSel +DYNAMIC Wvg_Line +DYNAMIC Wvg_LineEx +DYNAMIC Wvg_LoadIcon +DYNAMIC Wvg_LoadImage +DYNAMIC Wvg_LOWORD +DYNAMIC Wvg_MakeLParam +DYNAMIC Wvg_MessageBox +DYNAMIC Wvg_MoveWindow +DYNAMIC Wvg_Not +DYNAMIC Wvg_Object +DYNAMIC Wvg_Or +DYNAMIC Wvg_Outline +DYNAMIC Wvg_OutlineEx +DYNAMIC Wvg_Picture +DYNAMIC Wvg_PointSizeToHeight +DYNAMIC Wvg_PostMessage +DYNAMIC Wvg_PrepareBitmapFromFile +DYNAMIC Wvg_PrepareBitmapFromResourceId +DYNAMIC Wvg_PrepareBitmapFromResourceName +DYNAMIC Wvg_PurgePaint +DYNAMIC Wvg_Rectangle +DYNAMIC Wvg_RegisterClass_ByName +DYNAMIC Wvg_ReleaseDC +DYNAMIC Wvg_ReleaseWindowProcBlock +DYNAMIC Wvg_RoundRect +DYNAMIC Wvg_ScreenToClient +DYNAMIC Wvg_SelectObject +DYNAMIC Wvg_SendCBMessage +DYNAMIC Wvg_SendDlgItemMessage +DYNAMIC Wvg_SendEditControlMessage +DYNAMIC Wvg_SendMessage +DYNAMIC Wvg_SendMessagetExt +DYNAMIC Wvg_SendToolBarMessage +DYNAMIC Wvg_SetBkColor +DYNAMIC Wvg_SetBkMode +DYNAMIC Wvg_SetCurrentBrush +DYNAMIC Wvg_SetDCBrushColor +DYNAMIC Wvg_SetDCPenColor +DYNAMIC Wvg_SetDlgItemText +DYNAMIC Wvg_SetFocus +DYNAMIC Wvg_SetForegroundWindow +DYNAMIC Wvg_SetGObjData +DYNAMIC Wvg_SetGObjState +DYNAMIC Wvg_SetLayeredWindowAttributes +DYNAMIC Wvg_SetMenu +DYNAMIC Wvg_SetMenuItem +DYNAMIC Wvg_SetPaint +DYNAMIC Wvg_SetParent +DYNAMIC Wvg_SetTextColor +DYNAMIC Wvg_SetTimer +DYNAMIC Wvg_SetToolTipText +DYNAMIC Wvg_SetWindowLong +DYNAMIC Wvg_SetWindowPosAndSize +DYNAMIC Wvg_SetWindowPosition +DYNAMIC Wvg_SetWindowPosToBack +DYNAMIC Wvg_SetWindowPosToTop +DYNAMIC Wvg_SetWindowProcBlock +DYNAMIC Wvg_SetWindowSize +DYNAMIC Wvg_SetWindowText +DYNAMIC Wvg_SetWndProc +DYNAMIC Wvg_ShadedRect +DYNAMIC Wvg_ShowWindow +DYNAMIC Wvg_Sleep +DYNAMIC Wvg_StatusBarCreatePanel +DYNAMIC Wvg_StatusBarRefresh +DYNAMIC Wvg_StatusBarSetText +DYNAMIC Wvg_TextBox +DYNAMIC Wvg_TrackPopupMenu +DYNAMIC Wvg_TreeView_AddItem +DYNAMIC Wvg_TreeView_Expand +DYNAMIC Wvg_TreeView_GetSelectionInfo +DYNAMIC Wvg_TreeView_SelectItem +DYNAMIC Wvg_TreeView_SetBkColor +DYNAMIC Wvg_TreeView_SetLineColor +DYNAMIC Wvg_TreeView_SetTextColor +DYNAMIC Wvg_TreeView_ShowExpanded +DYNAMIC Wvg_TVIS_Expanded +DYNAMIC Wvg_UpdateWindow +DYNAMIC WVTBanner +DYNAMIC WVTBrowse +DYNAMIC WVTConsole +DYNAMIC WVTDialog +DYNAMIC WVTGets +DYNAMIC WVTImage +DYNAMIC WVTLabel +DYNAMIC WVTMenu +DYNAMIC WVTObject +DYNAMIC WVTPaintObjects +DYNAMIC WVTPanel +DYNAMIC WVTProgressBar +DYNAMIC WVTPushButton +DYNAMIC WVTScrollBar +DYNAMIC WVTSetPaint +DYNAMIC WVTStatic +DYNAMIC WVTStatusBar +DYNAMIC WVTTextBox +DYNAMIC WVTToolBar +DYNAMIC WVTToolButton +DYNAMIC Wvt_AddDlgItem +DYNAMIC Wvt_AppendMenu +DYNAMIC Wvt_CBAddString +DYNAMIC Wvt_CBSetCurSel +DYNAMIC Wvt_CenterWindow +DYNAMIC Wvt_ChooseColor +DYNAMIC Wvt_ChooseFont +DYNAMIC Wvt_ClientToScreen +DYNAMIC Wvt_Core +DYNAMIC Wvt_CreateDialog +DYNAMIC Wvt_CreateDialogDynamic +DYNAMIC Wvt_CreateDialogModal +DYNAMIC Wvt_CreateFont +DYNAMIC Wvt_CreateMenu +DYNAMIC Wvt_CreatePOPUPMenu +DYNAMIC Wvt_DeleteMenu +DYNAMIC Wvt_DestroyMenu +DYNAMIC Wvt_DialogBox +DYNAMIC Wvt_DlgSetIcon +DYNAMIC Wvt_DrawBoxGet +DYNAMIC Wvt_DrawBoxGroup +DYNAMIC Wvt_DrawBoxGroupRaised +DYNAMIC Wvt_DrawBoxRaised +DYNAMIC Wvt_DrawBoxRecessed +DYNAMIC Wvt_DrawButton +DYNAMIC Wvt_DrawColorRect +DYNAMIC Wvt_DrawEllipse +DYNAMIC Wvt_DrawFocusRect +DYNAMIC Wvt_DrawGridHorz +DYNAMIC Wvt_DrawGridVert +DYNAMIC Wvt_DrawImage +DYNAMIC Wvt_DrawLabel +DYNAMIC Wvt_DrawLabelEx +DYNAMIC Wvt_DrawLabelObj +DYNAMIC Wvt_DrawLine +DYNAMIC Wvt_DrawLineEx +DYNAMIC Wvt_DrawMenuBar +DYNAMIC Wvt_DrawOutline +DYNAMIC Wvt_DrawOutlineEx +DYNAMIC Wvt_DrawPicture +DYNAMIC Wvt_DrawProgressBar +DYNAMIC Wvt_DrawRectangle +DYNAMIC Wvt_DrawRoundRect +DYNAMIC Wvt_DrawScrollButton +DYNAMIC Wvt_DrawScrollThumbHorz +DYNAMIC Wvt_DrawScrollThumbVert +DYNAMIC Wvt_DrawShadedRect +DYNAMIC Wvt_DrawStatusBar +DYNAMIC Wvt_DrawTextBox +DYNAMIC Wvt_DrawToolButtonState +DYNAMIC Wvt_EnableMenuItem +DYNAMIC Wvt_EnableShortcuts +DYNAMIC Wvt_GetClipboard +DYNAMIC Wvt_GetCursorPos +DYNAMIC Wvt_GetFontHandle +DYNAMIC Wvt_GetFontInfo +DYNAMIC Wvt_GetLastMenuEvent +DYNAMIC Wvt_GetMenu +DYNAMIC Wvt_GetOpenFilename +DYNAMIC Wvt_GetPaintRect +DYNAMIC Wvt_GetPalette +DYNAMIC Wvt_GetRGBColor +DYNAMIC Wvt_GetRGBColorBYString +DYNAMIC Wvt_GetSaveFilename +DYNAMIC Wvt_GetScreenHeight +DYNAMIC Wvt_GetScreenWidth +DYNAMIC Wvt_GetTitle +DYNAMIC Wvt_GetToolTipBKColor +DYNAMIC Wvt_GetToolTipTextColor +DYNAMIC Wvt_GetToolTipWidth +DYNAMIC Wvt_GetWindowHandle +DYNAMIC Wvt_GetXYFromRowCol +DYNAMIC Wvt_Hide +DYNAMIC Wvt_InvalidateRect +DYNAMIC Wvt_IsLButtonPressed +DYNAMIC Wvt_Keyboard +DYNAMIC Wvt_KillTimer +DYNAMIC Wvt_LBAddString +DYNAMIC Wvt_LBDeleteString +DYNAMIC Wvt_LBGetCount +DYNAMIC Wvt_LBSetCurSel +DYNAMIC Wvt_LoadFont +DYNAMIC Wvt_LoadPen +DYNAMIC Wvt_LoadPicture +DYNAMIC Wvt_LoadPictureFromResource +DYNAMIC Wvt_MakeDlgTemplate +DYNAMIC Wvt_Maximize +DYNAMIC Wvt_MessageBox +DYNAMIC Wvt_Minimize +DYNAMIC Wvt_PasteFromClipboard +DYNAMIC Wvt_ProcessMessages +DYNAMIC Wvt_RESetWindow +DYNAMIC Wvt_RestScreen +DYNAMIC Wvt_SaveScreen +DYNAMIC Wvt_SetAltF4Close +DYNAMIC Wvt_SetAsNormal +DYNAMIC Wvt_SetBrush +DYNAMIC Wvt_SetClipboard +DYNAMIC Wvt_SetCodepage +DYNAMIC Wvt_SetDlgCoMode +DYNAMIC Wvt_SetFont +DYNAMIC Wvt_SetGUI +DYNAMIC Wvt_SetIcon +DYNAMIC Wvt_SetLastMenuEvent +DYNAMIC Wvt_SetMenu +DYNAMIC Wvt_SetMenuKeyEvent +DYNAMIC Wvt_SetMouseMove +DYNAMIC Wvt_SetMousePos +DYNAMIC Wvt_SetOnTop +DYNAMIC Wvt_SetPalette +DYNAMIC Wvt_SetPen +DYNAMIC Wvt_SetPointer +DYNAMIC Wvt_SetPopupMenu +DYNAMIC Wvt_SetTimer +DYNAMIC Wvt_SetTitle +DYNAMIC Wvt_SetToolTip +DYNAMIC Wvt_SetToolTipActive +DYNAMIC Wvt_SetToolTipBkColor +DYNAMIC Wvt_SetToolTipMargin +DYNAMIC Wvt_SetToolTipText +DYNAMIC Wvt_SetToolTipTextColor +DYNAMIC Wvt_SetToolTipTitle +DYNAMIC Wvt_SetToolTipWidth +DYNAMIC Wvt_SetWindowPos +DYNAMIC Wvt_Show +DYNAMIC Wvt_ShowWindow +DYNAMIC Wvt_TrackPopupMenu +DYNAMIC Wvt_Update +DYNAMIC Wvt_Utils +DYNAMIC Wvt_WindowCentre +DYNAMIC Wvt__MakeDlgTemplate #if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__GTWVG__REQUEST ) #uncommand DYNAMIC => EXTERNAL diff --git a/harbour/contrib/gtwvg/hbgtwvg.ch b/harbour/contrib/gtwvg/hbgtwvg.ch index 0b997466fc..d4dd8b4ac4 100644 --- a/harbour/contrib/gtwvg/hbgtwvg.ch +++ b/harbour/contrib/gtwvg/hbgtwvg.ch @@ -53,9 +53,8 @@ #ifndef _HBGTWVG_CH #define _HBGTWVG_CH -/*-*/ /* Extended GT Manipulation Constants */ -/*-*/ + #ifndef HB_GTE_ACTIVATE #define HB_GTE_ACTIVATE 1 #define HB_GTE_SETFOCUS 2 @@ -193,6 +192,4 @@ #define GOBJ_OBJTYPE_OBJECT 25 /* One of the above objects */ -/*-*/ - #endif /* _HBGTWVG_CH */ diff --git a/harbour/contrib/gtwvg/wvgcore.c b/harbour/contrib/gtwvg/wvgcore.c index aeb048e909..c3c1124a87 100644 --- a/harbour/contrib/gtwvg/wvgcore.c +++ b/harbour/contrib/gtwvg/wvgcore.c @@ -63,16 +63,11 @@ * If you do not wish that, delete this exception notice. * */ -/*-*/ -/*-*/ -/*-*/ + /* - * GUI Drawing Functions - * Pritpal Bedi + * GUI Drawing Functions + * Pritpal Bedi */ -/*-*/ -/*-*/ -/*-*/ #include "hbwinole.h" #include "gtwvg.h" @@ -89,15 +84,11 @@ static void hb_wvt_DrawToolButtonFlat( HDC hdc, int iTop, int iLeft, int iBottom static void hb_wvt_DrawToolButtonUp( HDC hdc, int iTop, int iLeft, int iBottom, int iRight ); static void hb_wvt_DrawToolButtonDown( HDC hdc, int iTop, int iLeft, int iBottom, int iRight ); -/*-*/ - HB_FUNC( WVT_CORE ) { /* Retained for legacy code. */ } -/*-*/ - void hb_wvt_GetStringAttrib( int top, int left, int bottom, int right, HB_BYTE * sBuffer, HB_BYTE * sAttrib ) { int irow, icol, j; @@ -122,8 +113,6 @@ void hb_wvt_GetStringAttrib( int top, int left, int bottom, int right, HB_BYTE * } } -/*-*/ - void hb_wvt_PutStringAttrib( int top, int left, int bottom, int right, HB_BYTE * sBuffer, HB_BYTE * sAttrib ) { int irow, icol, j; @@ -143,7 +132,6 @@ void hb_wvt_PutStringAttrib( int top, int left, int bottom, int right, HB_BYTE * hb_gtEndWrite(); } -/*-*/ /* * Courtesy - Augusto Infante - Thanks */ @@ -214,8 +202,6 @@ IPicture * hb_wvt_gtLoadPicture( LPCTSTR image ) return ( IPicture * ) iPicture; } -/*-*/ - HB_BOOL hb_wvt_gtRenderPicture( int x1, int y1, int wd, int ht, IPicture * iPicture ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -310,8 +296,6 @@ HB_BOOL hb_wvt_gtRenderPicture( int x1, int y1, int wd, int ht, IPicture * iPict return bResult; } -/*-*/ - HB_BOOL hb_wvt_gtDestroyPicture( IPicture * iPicture ) { HB_BOOL bResult = HB_FALSE; @@ -325,7 +309,6 @@ HB_BOOL hb_wvt_gtDestroyPicture( IPicture * iPicture ) return bResult; } #endif /* #if ! defined( HB_OS_WIN_CE ) */ -/*-*/ POINT hb_wvt_gtGetXYFromColRow( int col, int row ) { @@ -339,11 +322,9 @@ POINT hb_wvt_gtGetXYFromColRow( int col, int row ) return xy; } -/*-*/ /* * Modeless Dialogs Implementation */ -/*-*/ BOOL CALLBACK hb_wvt_gtDlgProcMLess( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam ) { @@ -448,8 +429,6 @@ BOOL CALLBACK hb_wvt_gtDlgProcMLess( HWND hDlg, UINT message, WPARAM wParam, LPA return lReturn; } -/*-*/ - BOOL CALLBACK hb_wvt_gtDlgProcModal( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -561,8 +540,6 @@ BOOL CALLBACK hb_wvt_gtDlgProcModal( HWND hDlg, UINT message, WPARAM wParam, LPA return lReturn; } -/*-*/ - HB_BOOL hb_wvt_DrawImage( HDC hdc, int x1, int y1, int wd, int ht, LPCTSTR lpImage ) { #if ! defined( HB_OS_WIN_CE ) @@ -671,8 +648,6 @@ HB_BOOL hb_wvt_DrawImage( HDC hdc, int x1, int y1, int wd, int ht, LPCTSTR lpIma #endif } -/*-*/ - static void hb_wvt_DrawBoxRaised( HDC hdc, int iTop, int iLeft, int iBottom, int iRight ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -702,8 +677,6 @@ static void hb_wvt_DrawBoxRaised( HDC hdc, int iTop, int iLeft, int iBottom, int LineTo( hdc, iRight + 1, iBottom + 1 ); } -/*-*/ - static void hb_wvt_DrawBoxRecessed( HDC hdc, int iTop, int iLeft, int iBottom, int iRight ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -733,8 +706,6 @@ static void hb_wvt_DrawBoxRecessed( HDC hdc, int iTop, int iLeft, int iBottom, i LineTo( hdc, iRight + 1, iTop - 1 ); } -/*-*/ - static void hb_wvt_DrawOutline( HDC hdc, int iTop, int iLeft, int iBottom, int iRight ) { MoveToEx( hdc, iLeft, iTop, NULL ); /* Top */ @@ -750,8 +721,6 @@ static void hb_wvt_DrawOutline( HDC hdc, int iTop, int iLeft, int iBottom, int i LineTo( hdc, iRight, iBottom + 1 ); } -/*-*/ - static void hb_wvt_DrawBoxGet( HDC hdc, int iTop, int iLeft, int iBottom, int iRight ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -769,8 +738,6 @@ static void hb_wvt_DrawBoxGet( HDC hdc, int iTop, int iLeft, int iBottom, int iR LineTo( hdc, iLeft - 2, iBottom ); } -/*-*/ - static void hb_wvt_DrawBoxGroup( HDC hdc, int iTop, int iLeft, int iBottom, int iRight ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -805,8 +772,6 @@ static void hb_wvt_DrawBoxGroup( HDC hdc, int iTop, int iLeft, int iBottom, int LineTo( hdc, iRight, iTop ); } -/*-*/ - static void hb_wvt_DrawBoxGroupRaised( HDC hdc, int iTop, int iLeft, int iBottom, int iRight ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -840,8 +805,6 @@ static void hb_wvt_DrawBoxGroupRaised( HDC hdc, int iTop, int iLeft, int iBottom LineTo( hdc, iRight, iTop ); } -/*-*/ - static void hb_wvt_DrawToolButtonFlat( HDC hdc, int iTop, int iLeft, int iBottom, int iRight ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -861,8 +824,6 @@ static void hb_wvt_DrawToolButtonFlat( HDC hdc, int iTop, int iLeft, int iBottom LineTo( hdc, iRight, iTop ); } -/*-*/ - static void hb_wvt_DrawToolButtonUp( HDC hdc, int iTop, int iLeft, int iBottom, int iRight ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -884,8 +845,6 @@ static void hb_wvt_DrawToolButtonUp( HDC hdc, int iTop, int iLeft, int iBottom, LineTo( hdc, iRight, iTop ); } -/*-*/ - static void hb_wvt_DrawToolButtonDown( HDC hdc, int iTop, int iLeft, int iBottom, int iRight ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -907,8 +866,6 @@ static void hb_wvt_DrawToolButtonDown( HDC hdc, int iTop, int iLeft, int iBottom LineTo( hdc, iRight, iTop ); } -/*-*/ - static COLORREF hb_wvt_BgColorParam( int iParam ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -928,8 +885,6 @@ static COLORREF hb_wvt_BgColorParam( int iParam ) return color; } -/*-*/ - static COLORREF hb_wvt_FgColorParam( int iParam ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -949,7 +904,6 @@ static COLORREF hb_wvt_FgColorParam( int iParam ) return color; } -/*-*/ /* * Wvt_SetPen( nPenStyle, nWidth, nColor ) */ @@ -988,7 +942,6 @@ HB_FUNC( WVT_SETPEN ) } } -/*-*/ /* * Wvt_SetBrush( nStyle, nColor, [ nHatch ] ) */ @@ -1028,7 +981,6 @@ HB_FUNC( WVT_SETBRUSH ) } } -/*-*/ /* * Wvt_DrawBoxGet( nRow, nCol, nWidth ) */ @@ -1051,7 +1003,6 @@ HB_FUNC( WVT_DRAWBOXGET ) #endif } -/*-*/ /* * Wvt_DrawBoxRaised( nTop, nLeft, nBottom, nRight, aPxlOff ) */ @@ -1073,7 +1024,6 @@ HB_FUNC( WVT_DRAWBOXRAISED ) #endif } -/*-*/ /* * Wvt_DrawBoxRecessed( nTop, nLeft, nBottom, nRight, aPxlOff ) */ @@ -1095,7 +1045,6 @@ HB_FUNC( WVT_DRAWBOXRECESSED ) #endif } -/*-*/ /* * Wvt_DrawBoxGroup( nTop, nLeft, nBottom, nRight, aPxlOff ) */ @@ -1117,7 +1066,6 @@ HB_FUNC( WVT_DRAWBOXGROUP ) #endif } -/*-*/ /* * Wvt_DrawBoxRaised( nTop, nLeft, nBottom, nRight, aPxlOff ) */ @@ -1139,7 +1087,6 @@ HB_FUNC( WVT_DRAWBOXGROUPRAISED ) #endif } -/*-*/ /* * Wvt_DrawImage( nTop, nLeft, nBottom, nRight, cImage/nPictureSlot, aPxlOff ) */ @@ -1183,7 +1130,6 @@ HB_FUNC( WVT_DRAWIMAGE ) #endif } -/*-*/ /* * WVT_DRAWLABEL( nRow, nCol, cLabel, nAlign, nEscapement, nTextColor, nBkColor,; * cFontFace, nFontHeight, nFontWidth, nFontWeight, nQuality, ; @@ -1255,7 +1201,6 @@ HB_FUNC( WVT_DRAWLABEL ) hb_retl( HB_FALSE ); } -/*-*/ /* 1 2 3 4 5 6 7 8 * Wvt_DrawOutline( nTop, nLeft, nBottom, nRight, nThick, nShape, nRGBColor, aPxlOff ) */ @@ -1317,7 +1262,6 @@ HB_FUNC( WVT_DRAWOUTLINE ) } } -/*-*/ /* 1 2 3 4 5 6 7 8 9 10 11 * Wvt_DrawLine( nTop, nLeft, nBottom, nRight, nOrient, nFormat, nAlign, nStyle, nThick, nColor, aPxlOff ) */ @@ -1523,7 +1467,6 @@ HB_FUNC( WVT_DRAWLINE ) hb_retl( HB_TRUE ); } -/*-*/ /* * Inside the area requested! * Wvt_DrawEllipse( nTop, nLeft, nBottom, nRight, aPxlOff ) @@ -1549,7 +1492,6 @@ HB_FUNC( WVT_DRAWELLIPSE ) #endif } -/*-*/ /* * Wvt_DrawRectangle( nTop, nLeft, nBottom, nRight, aPxlOff ) */ @@ -1574,7 +1516,6 @@ HB_FUNC( WVT_DRAWRECTANGLE ) #endif } -/*-*/ /* * Wvt_DrawRoundRect( nTop, nLeft, nBottom, nRight, aPxlOff, nRoundHeight, nRoundWidth ) */ @@ -1603,7 +1544,6 @@ HB_FUNC( WVT_DRAWROUNDRECT ) #endif } -/*-*/ /* * Wvt_DrawFocusRect( nTop, nLeft, nBottom, nRight, aPxlOff ) */ @@ -1631,7 +1571,6 @@ HB_FUNC( WVT_DRAWFOCUSRECT ) #endif } -/*-*/ /* * Wvt_DrawColorRect( nTop, nLeft, nBottom, nRight, aPxlOff, nRGB ) */ @@ -1666,7 +1605,6 @@ HB_FUNC( WVT_DRAWCOLORRECT ) } } -/*-*/ /* 1 2 3 4 5 * Wvt_DrawGridHorz( nTop, nLeft, nRight, nRows, aPxlOff ) * aPxlOff[ 2 ] and aPxlOff[ 4 ] used @@ -1717,7 +1655,6 @@ HB_FUNC( WVT_DRAWGRIDHORZ ) hb_retl( HB_TRUE ); } -/*-*/ /* * Wvt_DrawGridVert( nTop, nBottom, aCols, nCols, aPxlOff ) * aPxlOff[ 1 ] and aPxlOff[ 3 ] used @@ -1767,7 +1704,6 @@ HB_FUNC( WVT_DRAWGRIDVERT ) hb_retl( HB_TRUE ); } -/*-*/ /* * Wvt_DrawButton( nTop, nLeft, nBottom, nRight, cText, cnImage, ; * nFormat, nTextColor, nBkColor, nImageAt, aPxlOff ) ; @@ -1937,7 +1873,6 @@ HB_FUNC( WVT_DRAWBUTTON ) hb_retl( HB_TRUE ); } -/*-*/ /* * Wvt_DrawStatusBar( nNumPanels, aTLBRofPanels ) */ @@ -2006,7 +1941,6 @@ HB_FUNC( WVT_DRAWSTATUSBAR ) LineTo( _s->hdc, iRight, iTop - 11 ); } -/*-*/ /* * Wvt_DrawPicture( nTop, nLeft, nBottom, nRight, nSlot, aPxlOff ) -> lOk * nSlot <= 20 aAdj == { 0,0,-2,-2 } To Adjust the pixels for { Top,Left,Bottom,Right } @@ -2038,7 +1972,6 @@ HB_FUNC( WVT_DRAWPICTURE ) #endif } -/*-*/ /* * WVT_DRAWLABELEX( nRow, nCol, cLabel, nAlign, nTextColor, nBkColor, nSlotFont, aPxlOff ) */ @@ -2084,7 +2017,6 @@ HB_FUNC( WVT_DRAWLABELEX ) hb_retl( HB_FALSE ); } -/*-*/ /* 1 2 3 4 5 6 7 8 9 * Wvt_DrawLineEx( nTop, nLeft, nBottom, nRight, nOrient, nFormat, nAlign, nSlotPen, aPxlOff ) */ @@ -2284,7 +2216,6 @@ HB_FUNC( WVT_DRAWLINEEX ) hb_retl( HB_TRUE ); } -/*-*/ /* * Wvt_DrawOutlineEx( nTop, nLeft, nBottom, nRight, nSlotPen, aPxlOff ) */ @@ -2321,7 +2252,6 @@ HB_FUNC( WVT_DRAWOUTLINEEX ) #endif } -/*-*/ /* 1 2 3 4 5 6 7 8 9 10 11 * WVT_DRAWLABELOBJ( nTop, nLeft, nBottom, nRight, cLabel, nAlignHorz, nAlignVert, nTextColor, nBkColor, hFont, aPxlOff ) */ @@ -2417,7 +2347,6 @@ HB_FUNC( WVT_DRAWLABELOBJ ) hb_retl( HB_TRUE ); } -/*-*/ /* * nState 0 Flat, 1 Raised, 2 Recessed * Wvt_DrawToolButtonState( nTop, nLeft, nBottom, nRight, aPxlOff, nState ) @@ -2466,7 +2395,6 @@ HB_FUNC( WVT_DRAWTOOLBUTTONSTATE ) hb_retl( HB_TRUE ); } -/*-*/ /* * Wvt_DrawScrollButton( nTop, nLeft, nBottom, nRight, aPxlOff, nTLBR, lDepressed ) */ @@ -2569,7 +2497,6 @@ HB_FUNC( WVT_DRAWSCROLLBUTTON ) hb_xfree( Point ); } -/*-*/ /* * Wvt_DrawScrollbarThumbVert( nTop, nLeft, nBottom, nRight, aPxlOff, nThumbPos ) */ @@ -2625,7 +2552,6 @@ HB_FUNC( WVT_DRAWSCROLLTHUMBVERT ) #endif } -/*-*/ /* * Wvt_DrawScrollbarThumbHorz( nTop, nLeft, nBottom, nRight, aPxlOff, nThumbPos ) */ @@ -2680,7 +2606,6 @@ HB_FUNC( WVT_DRAWSCROLLTHUMBHORZ ) } /* #if WINVER > 0x500 */ -/*-*/ /* * Wvt_DrawShadedRect( nTop, nLeft, nBottom, nRight, aPxlOff, nHorVert, aRGBb, aRGBe ) */ @@ -2731,7 +2656,6 @@ HB_FUNC( WVT_DRAWSHADEDRECT ) } /*#endif*/ -/*-*/ /* * Wvt_DrawTextBox( nTop, nLeft, nBottom, nRight, aPxlOff, cText, ; * nAlignHorz, nAlignVert, nTextColor, nBackColor, ; @@ -2797,7 +2721,6 @@ HB_FUNC( WVT_DRAWTEXTBOX ) hb_strfree( hText ); } -/*-*/ /* * Wvt_DrawProgressBar( nTop, nLeft, nBottom, nRight, aPxlOff, nPercent,; * nBackColor, nBarColor, cImage, lVertical, nDirection ) @@ -2900,7 +2823,6 @@ HB_FUNC( WVT_DRAWPROGRESSBAR ) } } -/*-*/ /* * Wvt_CreateFont( cFontFace, nHeight, nWidth, nWeight, lItalic, lUnderline, * lStrikeout, nCharSet, nQuality, nEscapement ) @@ -2932,7 +2854,6 @@ HB_FUNC( WVT_CREATEFONT ) hb_retnint( ( HB_PTRDIFF ) CreateFontIndirect( &logfont ) ); } -/*-*/ /* * Wvt_LoadPicture( nSlot, cFilePic ) */ @@ -2958,8 +2879,6 @@ HB_FUNC( WVT_LOADPICTURE ) hb_retl( bResult ); } -/*-*/ - HB_FUNC( WVT_LOADPICTUREFROMRESOURCE ) { HB_BOOL bResult = HB_FALSE; @@ -2984,7 +2903,6 @@ HB_FUNC( WVT_LOADPICTUREFROMRESOURCE ) hb_retl( bResult ); } -/*-*/ /* * Wvt_LoadFont( nSlotFont, cFontFace, nHeight, nWidth, nWeight, lItalic, lUnderline, lStrikeout, * nCharSet, nQuality, nEscapement ) @@ -3026,7 +2944,6 @@ HB_FUNC( WVT_LOADFONT ) } } -/*-*/ /* * Wvt_LoadPen( nSlot, nStyle, nWidth, nRGBColor ) */ @@ -3061,7 +2978,6 @@ HB_FUNC( WVT_LOADPEN ) } } -/*-*/ /* * aScr := Wvt_SaveScreen( nTop, nLeft, nBottom, nRight ) */ @@ -3101,7 +3017,6 @@ HB_FUNC( WVT_SAVESCREEN ) hb_itemReturnRelease( info ); } -/*-*/ /* * Wvt_RestScreen( nTop, nLeft, nBottom, nRight, aScr, lDoNotDestroyBMP ) */ @@ -3168,3 +3083,28 @@ HB_FUNC( WVT_RESTSCREEN ) } /*-*/ + +HB_FUNC( WVG_GTINFOEX ) +{ + if( HB_ISPOINTER( 1 ) && HB_ISNUM( 2 ) ) + { + PHB_GT pGT = hb_gt_ItemBase( hb_param( 1, HB_IT_ANY ) ); + + if( pGT ) + { + HB_GT_INFO gtInfo; + + gtInfo.pNewVal = hb_param( 3, HB_IT_ANY ); + gtInfo.pNewVal2 = hb_param( 4, HB_IT_ANY ); + gtInfo.pResult = NULL; + + HB_GTSELF_INFO( pGT, hb_parni( 2 ), >Info ); + hb_gt_BaseFree( pGT ); + + if( gtInfo.pResult ) + hb_itemReturnRelease( gtInfo.pResult ); + } + } + else + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); +} diff --git a/harbour/contrib/gtwvg/wvgcuig.c b/harbour/contrib/gtwvg/wvgcuig.c index 35b325278f..fcf632469e 100644 --- a/harbour/contrib/gtwvg/wvgcuig.c +++ b/harbour/contrib/gtwvg/wvgcuig.c @@ -63,9 +63,7 @@ * If you do not wish that, delete this exception notice. * */ -/*-*/ -/*-*/ -/*-*/ + /* * EkOnkar * ( The LORD is ONE ) @@ -78,14 +76,10 @@ * Pritpal Bedi * 28Feb2009 */ -/*-*/ -/*-*/ -/*-*/ #include "hbwinole.h" #include "gtwvg.h" -/*-*/ static PHB_GOBJS hb_wvg_ObjectNew( PHB_GTWVT pWVT ) { int iHandle = ( pWVT->gObjs ? pWVT->gObjs->iHandle + 1 : 1 ); @@ -103,7 +97,7 @@ static PHB_GOBJS hb_wvg_ObjectNew( PHB_GTWVT pWVT ) return gObj; } -/*-*/ + static void hb_wvg_RefreshRect( PHB_GTWVT pWVT, PHB_GOBJS gObj ) { RECT rc = { 0, 0, 0, 0 }; @@ -116,13 +110,13 @@ static void hb_wvg_RefreshRect( PHB_GTWVT pWVT, PHB_GOBJS gObj ) InvalidateRect( pWVT->hWnd, &rc, FALSE ); } -/*-*/ + static void hb_wvg_RestFromBuffer( PHB_GTWVT pWVT, int iLeft, int iTop, int iRight, int iBottom ) { BitBlt( pWVT->hdc, iLeft, iTop, iRight - iLeft, iBottom - iTop, pWVT->hGuiDC, iLeft, iTop, SRCCOPY ); } -/*-*/ + /* Wvg_ClearGUIObjects() -> NIL */ @@ -162,7 +156,7 @@ HB_FUNC( WVG_CLEARGUIOBJECTS ) pWVT->gObjs = NULL; } } -/*-*/ + HB_FUNC( WVG_SETGOBJSTATE ) { PHB_GTWVT pWVT = hb_wvt_gtGetWVT(); @@ -195,7 +189,7 @@ HB_FUNC( WVG_SETGOBJSTATE ) } hb_retni( iOState ); } -/*-*/ + /* Wvg_SetGuiObjectData( hObj, nGobjDataType, xData, xData1 ) -> lSuccess */ @@ -308,7 +302,7 @@ HB_FUNC( WVG_SETGOBJDATA ) } hb_retl( bSuccess ); } -/*-*/ + /* Wvg_BoxRaised( nTop, nLeft, nBottom, nRight, aPxlOff ) */ @@ -332,7 +326,7 @@ HB_FUNC( WVG_BOXRAISED ) gObj->gObjNext = pWVT->gObjs; pWVT->gObjs = gObj; } -/*-*/ + static void hb_wvg_BoxRaised( PHB_GTWVT pWVT, int iLeft, int iTop, int iRight, int iBottom ) { HDC hdc = pWVT->hdc; @@ -362,7 +356,7 @@ static void hb_wvg_BoxRaised( PHB_GTWVT pWVT, int iLeft, int iTop, int iRight, i MoveToEx( hdc, iRight + 1, iTop - 1, NULL ); /* Right Outer */ LineTo( hdc, iRight + 1, iBottom + 1 ); } -/*-*/ + /* Wvg_BoxRecessed( nTop, nLeft, nBottom, nRight, aPxlOff ) -> NIL */ @@ -386,7 +380,7 @@ HB_FUNC( WVG_BOXRECESSED ) gObj->gObjNext = pWVT->gObjs; pWVT->gObjs = gObj; } -/*-*/ + static void hb_wvg_BoxRecessed( PHB_GTWVT pWVT, int iLeft, int iTop, int iRight, int iBottom ) { HDC hdc = pWVT->hdc; @@ -416,7 +410,7 @@ static void hb_wvg_BoxRecessed( PHB_GTWVT pWVT, int iLeft, int iTop, int iRight, MoveToEx( hdc, iLeft - 1, iTop - 1, NULL ); /* Top Outer */ LineTo( hdc, iRight + 1, iTop - 1 ); } -/*-*/ + /* Wvt_DrawBoxGet( nRow, nCol, nWidth ) -> NIL */ @@ -441,7 +435,7 @@ HB_FUNC( WVG_BOXGET ) pWVT->gObjs = gObj; } -/*-*/ + static void hb_wvg_BoxGet( PHB_GTWVT pWVT, int iLeft, int iTop, int iRight, int iBottom ) { HDC hdc = pWVT->hdc; @@ -459,7 +453,7 @@ static void hb_wvg_BoxGet( PHB_GTWVT pWVT, int iLeft, int iTop, int iRight, int MoveToEx( hdc, iLeft - 2, iTop - 2, NULL ); /* Left Outer */ LineTo( hdc, iLeft - 2, iBottom ); } -/*-*/ + /* Wvg_BoxGroup( nTop, nLeft, nBottom, nRight, aPxlOff ) -> NIL */ @@ -483,7 +477,7 @@ HB_FUNC( WVG_BOXGROUP ) gObj->gObjNext = pWVT->gObjs; pWVT->gObjs = gObj; } -/*-*/ + static void hb_wvg_BoxGroup( PHB_GTWVT pWVT, int iLeft, int iTop, int iRight, int iBottom ) { HDC hdc = pWVT->hdc; @@ -518,7 +512,7 @@ static void hb_wvg_BoxGroup( PHB_GTWVT pWVT, int iLeft, int iTop, int iRight, in MoveToEx( hdc, iLeft, iTop, NULL ); /* Top Inner */ LineTo( hdc, iRight, iTop ); } -/*-*/ + /* Wvg_BoxRaised( nTop, nLeft, nBottom, nRight, aPxlOff ) -> NIL */ @@ -576,7 +570,7 @@ static void hb_wvg_BoxGroupRaised( PHB_GTWVT pWVT, int iLeft, int iTop, int iRig MoveToEx( hdc, iLeft, iTop, NULL ); /* Top Inner */ LineTo( hdc, iRight, iTop ); } -/*-*/ + /* * WVG_LABEL( nRow, nCol, aPxlOff, cLabel, nAlign, * nEscapement, nTextColor, nBkColor, cFontFace, nFontHeight, @@ -636,7 +630,7 @@ HB_FUNC( WVG_LABEL ) pWVT->gObjs = gObj; } } -/*-*/ + /* WVG_LABELEX( nRow, nCol, aPxlOff, cLabel, nAlign, nTextColor, nBkColor, nSlotFont ) */ @@ -669,7 +663,7 @@ HB_FUNC( WVG_LABELEX ) gObj->gObjNext = pWVT->gObjs; pWVT->gObjs = gObj; } -/*-*/ + static void hb_wvg_Label( PHB_GTWVT pWVT, PHB_GOBJS gObj, int iLeft, int iTop ) { HFONT hOldFont; @@ -691,7 +685,7 @@ static void hb_wvg_Label( PHB_GTWVT pWVT, PHB_GOBJS gObj, int iLeft, int iTop ) SelectObject( pWVT->hdc, hOldFont ); } -/*-*/ + /* * 1 2 3 4 5 6 7 8 * Wvg_Outline( nTop, nLeft, nBottom, nRight, aPxlOff, nThick, nShape, nRGBColor ) @@ -731,7 +725,7 @@ HB_FUNC( WVG_OUTLINE ) gObj->gObjNext = pWVT->gObjs; pWVT->gObjs = gObj; } -/*-*/ + /* Wvg_OutlineEx( nTop, nLeft, nBottom, nRight, aPxlOff, nSlotPen ) */ @@ -766,7 +760,7 @@ HB_FUNC( WVG_OUTLINEEX ) gObj->gObjNext = pWVT->gObjs; pWVT->gObjs = gObj; } -/*-*/ + static void hb_wvg_Outline( PHB_GTWVT pWVT, PHB_GOBJS gObj, int iLeft, int iTop, int iRight, int iBottom ) { HDC hdc = pWVT->hdc; @@ -785,7 +779,7 @@ static void hb_wvg_Outline( PHB_GTWVT pWVT, PHB_GOBJS gObj, int iLeft, int iTop, MoveToEx( hdc, iRight, iTop, NULL ); /* Right */ LineTo( hdc, iRight, iBottom + 1 ); } -/*-*/ + /* 1 2 3 4 5 6 7 8 9 10 11 * Wvg_Line( nTop, nLeft, nBottom, nRight, aPxlOff, nOrient, nFormat, nAlign, nStyle, nThick, nColor ) */ @@ -820,7 +814,7 @@ HB_FUNC( WVG_LINE ) gObj->gObjNext = pWVT->gObjs; pWVT->gObjs = gObj; } -/*-*/ + /* 1 2 3 4 5 6 7 8 9 * Wvg_LineEx( nTop, nLeft, nBottom, nRight, aPxlOff, nOrient, nFormat, nAlign, nSlotPen ) */ @@ -851,7 +845,7 @@ HB_FUNC( WVG_LINEEX ) gObj->gObjNext = pWVT->gObjs; pWVT->gObjs = gObj; } -/*-*/ + static void hb_wvg_Line( PHB_GTWVT pWVT, PHB_GOBJS gObj, int iLeft, int iTop, int iRight, int iBottom ) { HDC hdc = pWVT->hdc; @@ -961,7 +955,7 @@ static void hb_wvg_Line( PHB_GTWVT pWVT, PHB_GOBJS gObj, int iLeft, int iTop, in } SelectObject( hdc, hOldPen ); } -/*-*/ + /* * Inside the area requested! * Wvg_Ellipse( nTop, nLeft, nBottom, nRight, aPxlOff ) @@ -991,7 +985,7 @@ HB_FUNC( WVG_ELLIPSE ) gObj->gObjNext = pWVT->gObjs; pWVT->gObjs = gObj; } -/*-*/ + static void hb_wvg_Ellipse( PHB_GTWVT pWVT, PHB_GOBJS gObj, int iLeft, int iTop, int iRight, int iBottom ) { HBRUSH hBrush = ( HBRUSH ) SelectObject( pWVT->hdc, gObj->hBrush ); @@ -1002,7 +996,7 @@ static void hb_wvg_Ellipse( PHB_GTWVT pWVT, PHB_GOBJS gObj, int iLeft, int iTop, SelectObject( pWVT->hdc, hPen ); SelectObject( pWVT->hdc, hBrush ); } -/*-*/ + /* Wvg_Rectangle( nTop, nLeft, nBottom, nRight, aPxlOff ) */ @@ -1031,7 +1025,7 @@ HB_FUNC( WVG_RECTANGLE ) gObj->gObjNext = pWVT->gObjs; pWVT->gObjs = gObj; } -/*-*/ + static void hb_wvg_Rectangle( PHB_GTWVT pWVT, PHB_GOBJS gObj, int iLeft, int iTop, int iRight, int iBottom ) { HBRUSH hBrush = ( HBRUSH ) SelectObject( pWVT->hdc, gObj->hBrush ); @@ -1042,7 +1036,7 @@ static void hb_wvg_Rectangle( PHB_GTWVT pWVT, PHB_GOBJS gObj, int iLeft, int iTo SelectObject( pWVT->hdc, hPen ); SelectObject( pWVT->hdc, hBrush ); } -/*-*/ + /* Wvg_RoundRect( nTop, nLeft, nBottom, nRight, aPxlOff, nRoundHeight, nRoundWidth ) */ @@ -1074,7 +1068,7 @@ HB_FUNC( WVG_ROUNDRECT ) gObj->gObjNext = pWVT->gObjs; pWVT->gObjs = gObj; } -/*-*/ + static void hb_wvg_RoundRect( PHB_GTWVT pWVT, PHB_GOBJS gObj, int iLeft, int iTop, int iRight, int iBottom ) { HBRUSH hBrush = ( HBRUSH ) SelectObject( pWVT->hdc, gObj->hBrush ); @@ -1085,7 +1079,7 @@ static void hb_wvg_RoundRect( PHB_GTWVT pWVT, PHB_GOBJS gObj, int iLeft, int iTo SelectObject( pWVT->hdc, hPen ); SelectObject( pWVT->hdc, hBrush ); } -/*-*/ + /* Wvg_ColorRect( nTop, nLeft, nBottom, nRight, aPxlOff, nRGB ) */ @@ -1117,7 +1111,7 @@ HB_FUNC( WVG_COLORRECT ) pWVT->gObjs = gObj; } } -/*-*/ + static void hb_wvg_ColorRect( PHB_GTWVT pWVT, PHB_GOBJS gObj, int iLeft, int iTop, int iRight, int iBottom ) { RECT rc = { 0, 0, 0, 0 }; @@ -1125,7 +1119,7 @@ static void hb_wvg_ColorRect( PHB_GTWVT pWVT, PHB_GOBJS gObj, int iLeft, int iTo SetRect( &rc, iLeft, iTop, iRight, iBottom ); FillRect( pWVT->hGuiDC, &rc, gObj->hBrush ); } -/*-*/ + /* Wvg_ShadedRect( nTop, nLeft, nBottom, nRight, aPxlOff, nHorVert, aRGBb, aRGBe ) */ @@ -1169,7 +1163,7 @@ HB_FUNC( WVG_SHADEDRECT ) pWVT->gObjs = gObj; } } -/*-*/ + static void hb_wvg_ShadedRect( PHB_GTWVT pWVT, PHB_GOBJS gObj, int iLeft, int iTop, int iRight, int iBottom ) { HB_BOOL bGF; @@ -1188,7 +1182,7 @@ static void hb_wvg_ShadedRect( PHB_GTWVT pWVT, PHB_GOBJS gObj, int iLeft, int iT HB_SYMBOL_UNUSED( bGF ); } -/*-*/ + /* * Wvg_TextBox( nTop, nLeft, nBottom, nRight, aPxlOff, cText, ; * nAlignHorz, nAlignVert, nTextColor, nBackColor, hFont ) @@ -1236,7 +1230,7 @@ HB_FUNC( WVG_TEXTBOX ) gObj->gObjNext = pWVT->gObjs; pWVT->gObjs = gObj; } -/*-*/ + static void hb_wvg_TextBox( PHB_GTWVT pWVT, PHB_GOBJS gObj, int iLeft, int iTop, int iRight, int iBottom ) { RECT rc = { 0, 0, 0, 0 }; @@ -1257,7 +1251,7 @@ static void hb_wvg_TextBox( PHB_GTWVT pWVT, PHB_GOBJS gObj, int iLeft, int iTop, DrawText( hdc, gObj->lpText, lstrlen( gObj->lpText ), &rc, gObj->iAlign | DT_WORDBREAK | DT_TOP ); } -/*-*/ + /* * Wvt_DrawPicture( nTop, nLeft, nBottom, nRight, nSlot, aPxlOff ) -> lOk * Wvg_Picture( nTop, nLeft, nBottom, nRight, aPxlOff, nSlot ) -> NIL @@ -1296,7 +1290,7 @@ HB_FUNC( WVG_PICTURE ) hb_retni( 0 ); #endif } -/*-*/ + /* Wvg_Image( nTop, nLeft, nBottom, nRight, aPxlOff, nImageSource, cImage/nPictureSlot, cSection ) */ @@ -1377,7 +1371,7 @@ HB_FUNC( WVG_IMAGE ) hb_retni( 0 ); #endif } -/*-*/ + static void hb_wvg_RenderPicture( PHB_GTWVT pWVT, PHB_GOBJS gObj, int iLeft, int iTop, int iRight, int iBottom ) { #if ! defined( HB_OS_WIN_CE ) @@ -1440,7 +1434,7 @@ static void hb_wvg_RenderPicture( PHB_GTWVT pWVT, PHB_GOBJS gObj, int iLeft, int HB_SYMBOL_UNUSED( iBottom ); #endif } -/*-*/ + /* Wvg_Object( nObj, bBlock ) nObj == one of the objects == GOBJ_OBJTYPE_ROUNDRECT | GOBJ_OBJTYPE_IMAGE | etc @@ -1465,7 +1459,7 @@ HB_FUNC( WVG_OBJECT ) gObj->gObjNext = pWVT->gObjs; pWVT->gObjs = gObj; } -/*-*/ + /* * Wvg_Object( GOBJ_OBJTYPE_GRIDVERT, {|| { nTop, nBottom, aCols, nCols, aPxlOff } } ) * aPxlOff[ 1 ] and aPxlOff[ 3 ] used @@ -1510,7 +1504,7 @@ static void hb_wvg_GridVert( PHB_GTWVT pWVT, PHB_ITEM pArray, RECT * uRect ) } } } -/*-*/ + static void hb_wvg_GridHorz( PHB_GTWVT pWVT, PHB_ITEM pArray, RECT * uRect ) { @@ -1550,9 +1544,9 @@ static void hb_wvg_GridHorz( PHB_GTWVT pWVT, PHB_ITEM pArray, RECT * uRect ) iAtRow++; } } -/*-*/ + /* Owner Draw Implementation */ -/*-*/ + void hb_gt_wvt_PaintGObjects( PHB_GTWVT pWVT, RECT * uRect ) { PHB_GOBJS gObj = pWVT->gObjs; @@ -1759,4 +1753,3 @@ void hb_gt_wvt_PaintGObjects( PHB_GTWVT pWVT, RECT * uRect ) gObj = gObj->gObjNext; } } -/*-*/ diff --git a/harbour/contrib/gtwvg/wvgparts.ch b/harbour/contrib/gtwvg/wvgparts.ch index 8bd5fc7d63..1ac236d5e9 100644 --- a/harbour/contrib/gtwvg/wvgparts.ch +++ b/harbour/contrib/gtwvg/wvgparts.ch @@ -49,11 +49,8 @@ * If you do not wish that, delete this exception notice. * */ -/*-*/ -/* WvgParts.ch */ -/*-*/ -#ifndef _WVG_CH +#ifndef _WVG_CH #define _WVG_CH @@ -85,7 +82,6 @@ #define objTypeScrollBar 21 #define objTypeTabPage 22 -/*-*/ /* NMHDR info */ #define NMH_code 1 @@ -127,6 +123,7 @@ #define WVGTOOLBAR_BUTTON_DEFAULT 0 /* Statusbar Manipulation Constants */ + #define WVGSTATUSBAR_AUTOSIZE_NONE 0 #define WVGSTATUSBAR_AUTOSIZE_SPRING 1 #define WVGSTATUSBAR_AUTOSIZE_CONTENTS 2 @@ -220,6 +217,4 @@ #define WVGCOMBO_DROPDOWN 2 #define WVGCOMBO_DROPDOWNLIST 3 -#endif /* #ifndef _WVG_CH */ - -/*-*/ +#endif /* _WVG_CH */ diff --git a/harbour/contrib/gtwvg/wvgutils.c b/harbour/contrib/gtwvg/wvgutils.c index ba35f090c3..2e1d5975e1 100644 --- a/harbour/contrib/gtwvg/wvgutils.c +++ b/harbour/contrib/gtwvg/wvgutils.c @@ -64,8 +64,6 @@ * */ -/*-*/ - #include "gtwvg.h" /* workaround for missing declaration in MinGW32 */ @@ -81,7 +79,6 @@ BOOL WINAPI ChooseColor( LPCHOOSECOLORW ); #endif /* __MINGW32CE__ */ -/*-*/ #if 0 HB_EXTERN_BEGIN @@ -107,22 +104,15 @@ static HINSTANCE wvg_hInstance( void ) return ( HINSTANCE ) hInstance; } -/*-*/ -/*-*/ -/*-*/ /* * Pritpal Bedi */ -/*-*/ -/*-*/ -/*-*/ HB_FUNC( WVT_UTILS ) { /* Retained for legacy code. */ } -/*-*/ /* * Wvt_ChooseFont( cFontName, nHeight, nWidth, nWeight, nQuality, ; * lItalic, lUnderline, lStrikeout ) @@ -211,7 +201,6 @@ HB_FUNC( WVT_CHOOSEFONT ) #endif } -/*-*/ /* * Wvt_ChooseColor( nRGBInit, aRGB16, nFlags ) => nRGBSelected */ @@ -244,7 +233,6 @@ HB_FUNC( WVT_CHOOSECOLOR ) } } -/*-*/ /* * Wvt_MessageBox( cMessage, cTitle, nIcon, hWnd ) */ @@ -260,11 +248,9 @@ HB_FUNC( WVT_MESSAGEBOX ) hb_strfree( hMsg ); } -/*-*/ /* * Tooltips */ -/*-*/ HB_FUNC( WVT_SETTOOLTIPACTIVE ) { @@ -280,7 +266,6 @@ HB_FUNC( WVT_SETTOOLTIPACTIVE ) hb_retl( bActive ); } -/*-*/ /* * Wvt_SetToolTip( nTop, nLeft, nBottom, nRight, cToolText ) */ @@ -324,8 +309,6 @@ HB_FUNC( WVT_SETTOOLTIP ) } } -/*-*/ - HB_FUNC( WVT_SETTOOLTIPTEXT ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -345,8 +328,6 @@ HB_FUNC( WVT_SETTOOLTIPTEXT ) } } -/*-*/ - HB_FUNC( WVT_SETTOOLTIPMARGIN ) { #if ! defined( __WINCE__ ) @@ -363,8 +344,6 @@ HB_FUNC( WVT_SETTOOLTIPMARGIN ) #endif } -/*-*/ - HB_FUNC( WVT_SETTOOLTIPWIDTH ) { #if ! defined( __WINCE__ ) @@ -381,8 +360,6 @@ HB_FUNC( WVT_SETTOOLTIPWIDTH ) #endif } -/*-*/ - HB_FUNC( WVT_SETTOOLTIPBKCOLOR ) { #if ! defined( __WINCE__ ) @@ -397,8 +374,6 @@ HB_FUNC( WVT_SETTOOLTIPBKCOLOR ) #endif } -/*-*/ - HB_FUNC( WVT_SETTOOLTIPTEXTCOLOR ) { #if ! defined( __WINCE__ ) @@ -413,7 +388,6 @@ HB_FUNC( WVT_SETTOOLTIPTEXTCOLOR ) #endif } -/*-*/ #if _WIN32_IE > 0x400 HB_FUNC( WVT_SETTOOLTIPTITLE ) @@ -438,7 +412,6 @@ HB_FUNC( WVT_SETTOOLTIPTITLE ) } #endif -/*-*/ HB_FUNC( WVT_GETTOOLTIPWIDTH ) { @@ -449,8 +422,6 @@ HB_FUNC( WVT_GETTOOLTIPWIDTH ) #endif } -/*-*/ - HB_FUNC( WVT_GETTOOLTIPBKCOLOR ) { #if ! defined( __WINCE__ ) @@ -460,8 +431,6 @@ HB_FUNC( WVT_GETTOOLTIPBKCOLOR ) #endif } -/*-*/ - HB_FUNC( WVT_GETTOOLTIPTEXTCOLOR ) { #if ! defined( __WINCE__ ) @@ -471,8 +440,6 @@ HB_FUNC( WVT_GETTOOLTIPTEXTCOLOR ) #endif } -/*-*/ - HB_FUNC( WVT_SETGUI ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -485,8 +452,6 @@ HB_FUNC( WVT_SETGUI ) hb_retl( bGui ); } -/*-*/ - HB_FUNC( WVT_SETMOUSEPOS ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -501,8 +466,6 @@ HB_FUNC( WVT_SETMOUSEPOS ) hb_retl( HB_FALSE ); } -/*-*/ - HB_FUNC( WVT_GETPAINTRECT ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -517,8 +480,6 @@ HB_FUNC( WVT_GETPAINTRECT ) hb_itemReturnRelease( info ); } -/*-*/ - HB_FUNC( WVT_SETPOINTER ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -529,31 +490,31 @@ HB_FUNC( WVT_SETPOINTER ) switch( iCursor ) { case 1: - hCursor = LoadCursor( NULL, IDC_ARROW ); + hCursor = LoadCursor( NULL, IDC_ARROW ); break; case 2: - hCursor = LoadCursor( NULL, IDC_IBEAM ); + hCursor = LoadCursor( NULL, IDC_IBEAM ); break; case 3: - hCursor = LoadCursor( NULL, IDC_WAIT ); + hCursor = LoadCursor( NULL, IDC_WAIT ); break; case 4: - hCursor = LoadCursor( NULL, IDC_CROSS ); + hCursor = LoadCursor( NULL, IDC_CROSS ); break; case 5: - hCursor = LoadCursor( NULL, IDC_UPARROW ); + hCursor = LoadCursor( NULL, IDC_UPARROW ); break; case 6: - hCursor = LoadCursor( NULL, IDC_SIZE ); + hCursor = LoadCursor( NULL, IDC_SIZE ); break; case 7: - hCursor = LoadCursor( NULL, IDC_ICON ); + hCursor = LoadCursor( NULL, IDC_ICON ); break; case 8: @@ -565,23 +526,23 @@ HB_FUNC( WVT_SETPOINTER ) break; case 10: - hCursor = LoadCursor( NULL, IDC_SIZEWE ); + hCursor = LoadCursor( NULL, IDC_SIZEWE ); break; case 11: - hCursor = LoadCursor( NULL, IDC_SIZENS ); + hCursor = LoadCursor( NULL, IDC_SIZENS ); break; case 12: - hCursor = LoadCursor( NULL, IDC_SIZEALL ); + hCursor = LoadCursor( NULL, IDC_SIZEALL ); break; case 13: - hCursor = LoadCursor( NULL, IDC_NO ); + hCursor = LoadCursor( NULL, IDC_NO ); break; case 14: - hCursor = LoadCursor( NULL, IDC_HAND ); + hCursor = LoadCursor( NULL, IDC_HAND ); break; case 15: @@ -589,11 +550,11 @@ HB_FUNC( WVT_SETPOINTER ) break; case 16: - hCursor = LoadCursor( NULL, IDC_HELP ); + hCursor = LoadCursor( NULL, IDC_HELP ); break; default: - hCursor = LoadCursor( NULL, IDC_ARROW ); + hCursor = LoadCursor( NULL, IDC_ARROW ); break; } @@ -605,8 +566,6 @@ HB_FUNC( WVT_SETPOINTER ) #endif } -/*-*/ - HB_FUNC( WVT_SETMOUSEMOVE ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -619,8 +578,6 @@ HB_FUNC( WVT_SETMOUSEMOVE ) hb_retl( bMouseMove ); } -/*-*/ - HB_FUNC( WVT_GETXYFROMROWCOL ) { PHB_ITEM info = hb_itemArrayNew( 2 ); @@ -634,8 +591,6 @@ HB_FUNC( WVT_GETXYFROMROWCOL ) hb_itemReturnRelease( info ); } -/*-*/ - HB_FUNC( WVT_GETFONTINFO ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -653,15 +608,9 @@ HB_FUNC( WVT_GETFONTINFO ) hb_itemReturnRelease( info ); } -/*-*/ -/*-*/ -/*-*/ /* * Peter Rees */ -/*-*/ -/*-*/ -/*-*/ HB_FUNC( WVT_SETMENU ) { @@ -691,8 +640,6 @@ HB_FUNC( WVT_SETMENU ) SetWindowPos( _s->hWnd, NULL, wi.left, wi.top, width, height, SWP_NOZORDER ); } -/*-*/ - HB_FUNC( WVT_SETPOPUPMENU ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -706,47 +653,33 @@ HB_FUNC( WVT_SETPOPUPMENU ) } } -/*-*/ - HB_FUNC( WVT_CREATEMENU ) { hb_retnint( ( HB_PTRDIFF ) CreateMenu() ); } -/*-*/ - HB_FUNC( WVT_CREATEPOPUPMENU ) { hb_retnint( ( HB_PTRDIFF ) CreatePopupMenu() ); } -/*-*/ - HB_FUNC_TRANSLATE( WVT_APPENDMENU, WVG_APPENDMENU ) -/*-*/ - HB_FUNC( WVT_DELETEMENU ) { hb_retl( DeleteMenu( ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ), ( UINT ) hb_parni( 3 ) ) ); } -/*-*/ - HB_FUNC( WVT_DESTROYMENU ) { hb_retl( DestroyMenu( ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 ) ) ); } -/*-*/ - HB_FUNC( WVT_ENABLEMENUITEM ) { hb_retni( EnableMenuItem( ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ), ( UINT ) hb_parni( 3 ) ) ); } -/*-*/ - HB_FUNC( WVT_GETLASTMENUEVENT ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -754,8 +687,6 @@ HB_FUNC( WVT_GETLASTMENUEVENT ) hb_retni( _s->LastMenuEvent ); } -/*-*/ - HB_FUNC( WVT_SETLASTMENUEVENT ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -768,8 +699,6 @@ HB_FUNC( WVT_SETLASTMENUEVENT ) hb_retni( iEvent ); } -/*-*/ - HB_FUNC( WVT_SETMENUKEYEVENT ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -782,8 +711,6 @@ HB_FUNC( WVT_SETMENUKEYEVENT ) hb_retni( iOldEvent ); } -/*-*/ - HB_FUNC( WVT_DRAWMENUBAR ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -791,8 +718,6 @@ HB_FUNC( WVT_DRAWMENUBAR ) DrawMenuBar( _s->hWnd ); } -/*-*/ - HB_FUNC( WVT_ENABLESHORTCUTS ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -805,8 +730,6 @@ HB_FUNC( WVT_ENABLESHORTCUTS ) hb_retl( bWas ); } -/*-*/ - HB_FUNC( WVT_INVALIDATERECT ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -824,15 +747,11 @@ HB_FUNC( WVT_INVALIDATERECT ) InvalidateRect( _s->hWnd, &rc, TRUE ); } -/*-*/ - HB_FUNC( WVT_ISLBUTTONPRESSED ) { hb_retl( GetKeyState( VK_LBUTTON ) & 0x8000 ); } -/*-*/ - HB_FUNC( WVT_CLIENTTOSCREEN ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -850,8 +769,6 @@ HB_FUNC( WVT_CLIENTTOSCREEN ) hb_itemReturnRelease( info ); } -/*-*/ - HB_FUNC( WVT_GETCURSORPOS ) { POINT xy = { 0, 0 }; @@ -865,8 +782,6 @@ HB_FUNC( WVT_GETCURSORPOS ) hb_itemReturnRelease( info ); } -/*-*/ - HB_FUNC( WVT_TRACKPOPUPMENU ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -884,8 +799,6 @@ HB_FUNC( WVT_TRACKPOPUPMENU ) NULL ) ); } -/*-*/ - HB_FUNC( WVT_GETMENU ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -893,15 +806,9 @@ HB_FUNC( WVT_GETMENU ) hb_retnint( ( HB_PTRDIFF ) GetMenu( _s->hWnd ) ); } -/*-*/ -/*-*/ -/*-*/ /* * Dialogs */ -/*-*/ -/*-*/ -/*-*/ HB_FUNC( WVT_CREATEDIALOGDYNAMIC ) { @@ -1024,8 +931,6 @@ HB_FUNC( WVT_CREATEDIALOGDYNAMIC ) hb_retnint( ( HB_PTRDIFF ) hDlg ); } -/*-*/ - HB_FUNC( WVT_CREATEDIALOGMODAL ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -1108,8 +1013,6 @@ HB_FUNC( WVT_CREATEDIALOGMODAL ) hb_retnint( iResult ); } -/*-*/ - HB_FUNC( WVT__MAKEDLGTEMPLATE ) { WORD * p, * pdlgtemplate; @@ -1223,7 +1126,6 @@ HB_FUNC( WVT__MAKEDLGTEMPLATE ) LocalFree( LocalHandle( pdlgtemplate ) ); } -/*-*/ /* * Helper routine. Take an input pointer, return closest * pointer that is aligned on a DWORD (4 byte) boundary. @@ -1238,8 +1140,6 @@ LPWORD lpwAlign( LPWORD lpIn ) return ( LPWORD ) ul; } -/*-*/ - int nCopyAnsiToWideChar( LPWORD lpWCStr, LPCSTR lpAnsiIn ) { int nChar = 0; @@ -1254,8 +1154,6 @@ int nCopyAnsiToWideChar( LPWORD lpWCStr, LPCSTR lpAnsiIn ) return nChar; } -/*-*/ - HB_FUNC( WVT_LBADDSTRING ) { void * hText; @@ -1264,29 +1162,21 @@ HB_FUNC( WVT_LBADDSTRING ) hb_strfree( hText ); } -/*-*/ - HB_FUNC( WVT_LBGETCOUNT ) { hb_retnl( ( long ) SendMessage( GetDlgItem( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ) ), LB_GETCOUNT, 0, 0 ) ); } -/*-*/ - HB_FUNC( WVT_LBDELETESTRING ) { SendMessage( GetDlgItem( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ) ), LB_DELETESTRING, hb_parni( 3 ), 0 ); } -/*-*/ - HB_FUNC( WVT_LBSETCURSEL ) { SendMessage( GetDlgItem( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ) ), LB_SETCURSEL, hb_parni( 3 ), 0 ); } -/*-*/ - HB_FUNC( WVT_CBADDSTRING ) { void * hText; @@ -1295,14 +1185,11 @@ HB_FUNC( WVT_CBADDSTRING ) hb_strfree( hText ); } -/*-*/ - HB_FUNC( WVT_CBSETCURSEL ) { SendMessage( GetDlgItem( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ) ), CB_SETCURSEL, hb_parni( 3 ), 0 ); } -/*-*/ /* * Wvt_DlgSetIcon( hDlg, ncIcon ) */ @@ -1336,7 +1223,6 @@ HB_FUNC( WVT_DLGSETICON ) hb_retnint( ( HB_PTRDIFF ) hIcon ); } } -/*-*/ HB_FUNC( WVT_GETFONTHANDLE ) { @@ -1351,15 +1237,9 @@ HB_FUNC( WVT_GETFONTHANDLE ) hb_retnint( ( HB_PTRDIFF ) hFont ); } -/*-*/ -/*-*/ -/*-*/ /* * Utility Functions - Not API */ -/*-*/ -/*-*/ -/*-*/ HB_BOOL wvt_Array2Rect( PHB_ITEM aRect, RECT * rc ) { @@ -1374,8 +1254,6 @@ HB_BOOL wvt_Array2Rect( PHB_ITEM aRect, RECT * rc ) return HB_FALSE; } -/*-*/ - PHB_ITEM wvt_Rect2Array( RECT * rc ) { PHB_ITEM aRect = hb_itemArrayNew( 4 ); @@ -1388,8 +1266,6 @@ PHB_ITEM wvt_Rect2Array( RECT * rc ) return aRect; } -/*-*/ - HB_BOOL wvt_Array2Point( PHB_ITEM aPoint, POINT * pt ) { if( HB_IS_ARRAY( aPoint ) && hb_arrayLen( aPoint ) == 2 ) @@ -1401,8 +1277,6 @@ HB_BOOL wvt_Array2Point( PHB_ITEM aPoint, POINT * pt ) return HB_FALSE; } -/*-*/ - PHB_ITEM wvt_Point2Array( POINT * pt ) { PHB_ITEM aPoint = hb_itemArrayNew( 2 ); @@ -1413,8 +1287,6 @@ PHB_ITEM wvt_Point2Array( POINT * pt ) return aPoint; } -/*-*/ - HB_BOOL wvt_Array2Size( PHB_ITEM aSize, SIZE * siz ) { if( HB_IS_ARRAY( aSize ) && hb_arrayLen( aSize ) == 2 ) @@ -1426,8 +1298,6 @@ HB_BOOL wvt_Array2Size( PHB_ITEM aSize, SIZE * siz ) return HB_FALSE; } -/*-*/ - PHB_ITEM wvt_Size2Array( SIZE * siz ) { PHB_ITEM aSize = hb_itemArrayNew( 2 ); @@ -1438,9 +1308,7 @@ PHB_ITEM wvt_Size2Array( SIZE * siz ) return aSize; } -/*-*/ - -void wvt_Rect2ArrayEx( RECT * rc, PHB_ITEM aRect ) +void wvt_Rect2ArrayEx( RECT * rc, PHB_ITEM aRect ) { hb_arraySetNL( aRect, 1, rc->left ); hb_arraySetNL( aRect, 2, rc->top ); @@ -1448,20 +1316,14 @@ void wvt_Rect2ArrayEx( RECT * rc, PHB_ITEM aRect ) hb_arraySetNL( aRect, 4, rc->bottom ); } -/*-*/ - void wvt_Point2ArrayEx( POINT * pt, PHB_ITEM aPoint ) { hb_arraySetNL( aPoint, 1, pt->x ); hb_arraySetNL( aPoint, 2, pt->y ); } -/*-*/ - void wvt_Size2ArrayEx( SIZE * siz, PHB_ITEM aSize ) { hb_arraySetNL( aSize, 1, siz->cx ); hb_arraySetNL( aSize, 2, siz->cy ); } - -/*-*/ diff --git a/harbour/contrib/gtwvg/wvgwin.c b/harbour/contrib/gtwvg/wvgwin.c index add3c673b1..8f5524eed1 100644 --- a/harbour/contrib/gtwvg/wvgwin.c +++ b/harbour/contrib/gtwvg/wvgwin.c @@ -63,16 +63,10 @@ * If you do not wish that, delete this exception notice. * */ -/*-*/ -/*-*/ -/*-*/ -/*-*/ + /* * Direct WinApi Functions - Prefixed WIN_*() */ -/*-*/ -/*-*/ -/*-*/ #include "gtwvg.h" #include "hbwapi.h" @@ -89,8 +83,6 @@ #define WIN_STATUSBAR_MAX_PARTS 256 -/*-*/ - #define wvg_parwparam( n ) ( ( WPARAM ) ( HB_PTRDIFF ) hb_parnint( n ) ) #define wvg_parlparam( n ) ( ( LPARAM ) ( HB_PTRDIFF ) hb_parnint( n ) ) #define wvg_parhandle( n ) ( ( HANDLE ) ( HB_PTRDIFF ) hb_parnint( n ) ) @@ -101,16 +93,12 @@ #define wvg_rethandle( n ) ( hb_retnint( ( HB_PTRDIFF ) n ) ) -/*-*/ - #if defined( __BORLANDC__ ) && ! defined( HB_ARCH_64BIT ) #undef MAKELONG #define MAKELONG( a, b ) ( ( LONG ) ( ( ( WORD ) ( ( DWORD_PTR ) ( a ) & 0xffff ) ) | \ ( ( ( DWORD ) ( ( WORD ) ( ( DWORD_PTR ) ( b ) & 0xffff ) ) ) << 16 ) ) ) #endif -/*-*/ - static HINSTANCE wvg_hInstance( void ) { HANDLE hInstance; @@ -120,8 +108,6 @@ static HINSTANCE wvg_hInstance( void ) return ( HINSTANCE ) hInstance; } -/*-*/ - HB_FUNC( WVG_SENDMESSAGE ) { void * hText = NULL; @@ -141,7 +127,6 @@ HB_FUNC( WVG_SENDMESSAGE ) hb_strfree( hText ); } } -/*-*/ HB_FUNC( WVG_SENDDLGITEMMESSAGE ) { @@ -170,7 +155,6 @@ HB_FUNC( WVG_SENDDLGITEMMESSAGE ) } } -/*-*/ /* * WIN_SetTimer( hWnd, nIdentifier, nTimeOut ) */ @@ -179,85 +163,61 @@ HB_FUNC( WVG_SETTIMER ) hb_retl( SetTimer( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ), hb_parni( 3 ), NULL ) != 0 ); } -/*-*/ - HB_FUNC( WVG_SETFOCUS ) { SetFocus( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ) ); } -/*-*/ - HB_FUNC( WVG_GETFOCUS ) { hb_retnint( ( HB_PTRDIFF ) GetFocus() ); } -/*-*/ - HB_FUNC( WVG_SETTEXTCOLOR ) { hb_retnl( ( HB_ULONG ) SetTextColor( ( HDC ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( COLORREF ) hb_parnl( 2 ) ) ); } -/*-*/ - HB_FUNC( WVG_SETBKCOLOR ) { hb_retnl( ( HB_ULONG ) SetBkColor( ( HDC ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( COLORREF ) hb_parnl( 2 ) ) ); } -/*-*/ - HB_FUNC( WVG_SETBKMODE ) { hb_retni( ( int ) SetBkMode( ( HDC ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ) ) ); } -/*-*/ - HB_FUNC( WVG_GETSTOCKOBJECT ) { hb_retnint( ( HB_PTRDIFF ) GetStockObject( hb_parni( 1 ) ) ); } -/*-*/ - HB_FUNC( WVG_DELETEOBJECT ) { hb_retl( DeleteObject( ( HGDIOBJ ) ( HB_PTRDIFF ) hb_parnint( 1 ) ) ); } -/*-*/ - HB_FUNC( WVG_SELECTOBJECT ) { hb_retnint( ( HB_PTRDIFF ) SelectObject( ( HDC ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( HGDIOBJ ) ( HB_PTRDIFF ) hb_parnint( 2 ) ) ); } -/*-*/ - HB_FUNC( WVG_LOWORD ) { hb_retnl( LOWORD( hb_parnl( 1 ) ) ); } -/*-*/ - HB_FUNC( WVG_HIWORD ) { hb_retnl( HIWORD( hb_parnl( 1 ) ) ); } -/*-*/ - HB_FUNC( WVG_GETDIALOGBASEUNITS ) { hb_retnl( ( long ) GetDialogBaseUnits() ); } -/*-*/ - HB_FUNC( WVG_SETDLGITEMTEXT ) { void * hText; @@ -266,8 +226,6 @@ HB_FUNC( WVG_SETDLGITEMTEXT ) hb_strfree( hText ); } -/*-*/ - HB_FUNC( WVG_GETDLGITEMTEXT ) { int iLen = ( int ) SendMessage( GetDlgItem( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ) ), WM_GETTEXTLENGTH, 0, 0 ) + 1; @@ -285,23 +243,17 @@ HB_FUNC( WVG_GETDLGITEMTEXT ) hb_xfree( cText ); } -/*-*/ - HB_FUNC( WVG_CHECKDLGBUTTON ) { hb_retl( CheckDlgButton( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ), ( UINT ) ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : hb_parl( 3 ) ) ) ); } -/*-*/ - HB_FUNC( WVG_ISDLGBUTTONCHECKED ) { hb_retni( IsDlgButtonChecked( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ) ) ); } -/*-*/ - HB_FUNC( WVG_CHECKRADIOBUTTON ) { hb_retl( CheckRadioButton( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), /* handle of dialog box */ @@ -311,15 +263,11 @@ HB_FUNC( WVG_CHECKRADIOBUTTON ) ) ); } -/*-*/ - HB_FUNC( WVG_GETDLGITEM ) { hb_retnint( ( HB_PTRDIFF ) GetDlgItem( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ) ) ); } -/*-*/ - HB_FUNC( WVG_MESSAGEBOX ) { HWND hWnd = HB_ISNUM( 1 ) ? ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ) : GetActiveWindow(); @@ -331,8 +279,6 @@ HB_FUNC( WVG_MESSAGEBOX ) hb_strfree( hTitle ); } -/*-*/ - HB_FUNC( WVG_INVALIDATERECT ) { if( HB_ISARRAY( 2 ) ) @@ -350,7 +296,6 @@ HB_FUNC( WVG_INVALIDATERECT ) hb_retl( InvalidateRect( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), NULL, TRUE ) ); } -/*-*/ /* * Win_LoadIcon( ncIcon ) */ @@ -372,7 +317,6 @@ HB_FUNC( WVG_LOADICON ) hb_retnint( ( HB_PTRDIFF ) hIcon ); } -/*-*/ /* * Win_LoadImage( ncImage, nSource, nBmpOrIcon, nWidth, nHeight ) -> hImage * nSource == 0 ResourceIdByNumber @@ -408,8 +352,6 @@ HB_FUNC( WVG_LOADIMAGE ) hb_retnint( ( HB_PTRDIFF ) hImage ); } -/*-*/ - HB_FUNC( WVG_GETCLIENTRECT ) { RECT rc = { 0, 0, 0, 0 }; @@ -425,7 +367,6 @@ HB_FUNC( WVG_GETCLIENTRECT ) hb_itemReturnRelease( info ); } -/*-*/ /* * Win_DrawImage( hdc, nLeft, nTop, nWidth, nHeight, cImage ) in Pixels */ @@ -438,19 +379,15 @@ HB_FUNC( WVG_DRAWIMAGE ) hb_strfree( hImage ); } -/*-*/ - HB_FUNC( WVG_GETDC ) { hb_retnint( ( HB_PTRDIFF ) GetDC( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ) ) ); } -/*-*/ HB_FUNC( WVG_RELEASEDC ) { hb_retl( ReleaseDC( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( HDC ) ( HB_PTRDIFF ) hb_parnint( 2 ) ) ); } -/*-*/ HB_FUNC( WVG_CREATEBRUSH ) { @@ -465,7 +402,7 @@ HB_FUNC( WVG_CREATEBRUSH ) hb_retnint( ( HB_PTRDIFF ) CreateSolidBrush( lb.lbColor ) ); #endif } -/*-*/ + /* * Win_DrawText( hDC, cText, aRect, nFormat ) */ @@ -484,8 +421,6 @@ HB_FUNC( WVG_DRAWTEXT ) hb_strfree( hBuffer ); } -/*-*/ - HB_FUNC( WVG_GETWINDOWRECT ) { RECT rc; @@ -501,7 +436,6 @@ HB_FUNC( WVG_GETWINDOWRECT ) hb_itemReturnRelease( info ); } -/*-*/ /* * Win_MoveWindow( hWnd, nLeft, nTop, nWidth, nHeight, lRePaint ) */ @@ -510,36 +444,26 @@ HB_FUNC( WVG_MOVEWINDOW ) MoveWindow( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parnl( 2 ), hb_parnl( 3 ), hb_parnl( 4 ), hb_parnl( 5 ), hb_parl( 6 ) ); } -/*-*/ - HB_FUNC( WVG_GETDESKTOPWINDOW ) { wvg_rethandle( GetDesktopWindow() ); } -/*-*/ - HB_FUNC( WVG_SETPARENT ) { hb_retnint( ( HB_PTRDIFF ) SetParent( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( HWND ) ( HB_PTRDIFF ) hb_parnint( 2 ) ) ); } -/*-*/ - HB_FUNC( WVG_BRINGWINDOWTOTOP ) { hb_retl( BringWindowToTop( wvg_parhwnd( 1 ) ) ); } -/*-*/ - HB_FUNC( WVG_SETFOREGROUNDWINDOW ) { hb_retl( BringWindowToTop( wvg_parhwnd( 1 ) ) ); } -/*-*/ - HB_FUNC( WVG_SETWINDOWTEXT ) { void * hText; @@ -548,36 +472,26 @@ HB_FUNC( WVG_SETWINDOWTEXT ) hb_strfree( hText ); } -/*-*/ - HB_FUNC( WVG_SETWINDOWLONG ) { hb_retnl( SetWindowLong( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ), hb_parnl( 3 ) ) ); } -/*-*/ - HB_FUNC( WVG_ISWINDOW ) { hb_retl( IsWindow( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ) ) ); } -/*-*/ - HB_FUNC( WVG_ENABLEWINDOW ) { hb_retl( EnableWindow( wvg_parhwnd( 1 ), hb_parl( 2 ) ) ); } -/*-*/ - HB_FUNC( WVG_DESTROYWINDOW ) { hb_retl( DestroyWindow( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ) ) ); } -/*-*/ - HB_FUNC( WVG_CLIENTTOSCREEN ) { POINT Point; @@ -597,8 +511,6 @@ HB_FUNC( WVG_CLIENTTOSCREEN ) hb_retl( HB_FALSE ); } -/*-*/ - HB_FUNC( WVG_SCREENTOCLIENT ) { POINT Point; @@ -618,29 +530,21 @@ HB_FUNC( WVG_SCREENTOCLIENT ) hb_retl( HB_FALSE ); } -/*-*/ - HB_FUNC( WVG_AND ) { hb_retnl( hb_parnl( 1 ) & hb_parnl( 2 ) ); } -/*-*/ - HB_FUNC( WVG_OR ) { hb_retnl( hb_parnl( 1 ) | hb_parnl( 2 ) ); } -/*-*/ - HB_FUNC( WVG_NOT ) { hb_retnl( ~( hb_parnl( 1 ) ) ); } -/*-*/ - HB_FUNC( WVG_TRACKPOPUPMENU ) { HMENU hMenu = ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 ); @@ -664,8 +568,6 @@ HB_FUNC( WVG_TRACKPOPUPMENU ) hb_retnl( TrackPopupMenu( hMenu, uFlags, xy.x, xy.y, 0, hWnd, NULL ) ); } -/*-*/ - HB_FUNC( WVG_CHOOSECOLOR ) { CHOOSECOLOR cc; @@ -687,8 +589,6 @@ HB_FUNC( WVG_CHOOSECOLOR ) hb_retnl( -1 ); } -/*-*/ - HB_FUNC( WVG_FINDWINDOW ) { HWND hwnd; @@ -703,16 +603,12 @@ HB_FUNC( WVG_FINDWINDOW ) hb_retnint( -1 ); } -/*-*/ - HB_FUNC( WVG_SLEEP ) { Sleep( hb_parni( 1 ) ); } -/*-*/ /* Menu Manipulations */ -/*-*/ HB_FUNC( WVG_SETMENU ) { @@ -744,22 +640,16 @@ HB_FUNC( WVG_SETMENU ) #endif } -/*-*/ - HB_FUNC( WVG_CREATEMENU ) { hb_retnint( ( HB_PTRDIFF ) CreateMenu() ); } -/*-*/ - HB_FUNC( WVG_CREATEPOPUPMENU ) { hb_retnint( ( HB_PTRDIFF ) CreatePopupMenu() ); } -/*-*/ - HB_FUNC( WVG_APPENDMENU ) { if( HB_ISCHAR( 4 ) ) @@ -775,8 +665,6 @@ HB_FUNC( WVG_APPENDMENU ) } } -/*-*/ - HB_FUNC( WVG_INSERTMENU ) { UINT flags = hb_parni( 3 ); @@ -796,36 +684,26 @@ HB_FUNC( WVG_INSERTMENU ) } } -/*-*/ - HB_FUNC( WVG_DELETEMENU ) { hb_retl( DeleteMenu( ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ), ( UINT ) hb_parni( 3 ) ) ); } -/*-*/ - HB_FUNC( WVG_DESTROYMENU ) { hb_retl( DestroyMenu( ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 ) ) ); } -/*-*/ - HB_FUNC( WVG_ENABLEMENUITEM ) { hb_retl( EnableMenuItem( ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ), ( UINT ) hb_parni( 3 ) ) ); } -/*-*/ - HB_FUNC( WVG_CHECKMENUITEM ) { hb_retni( CheckMenuItem( ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ), ( UINT ) hb_parni( 3 ) ) ); } -/*-*/ - HB_FUNC( WVG_ISMENUITEMCHECKED ) { BOOL lSuccess; @@ -844,8 +722,6 @@ HB_FUNC( WVG_ISMENUITEMCHECKED ) hb_retl( FALSE ); } -/*-*/ - HB_FUNC( WVG_ISMENUITEMENABLED ) { BOOL lSuccess; @@ -861,8 +737,6 @@ HB_FUNC( WVG_ISMENUITEMENABLED ) hb_retl( TRUE ); } -/*-*/ - HB_FUNC( WVG_SETMENUITEM ) { BOOL lSuccess; @@ -882,36 +756,26 @@ HB_FUNC( WVG_SETMENUITEM ) hb_strfree( hText ); } -/*-*/ - HB_FUNC( WVG_DRAWMENUBAR ) { DrawMenuBar( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ) ); } -/*-*/ - HB_FUNC( WVG_UPDATEWINDOW ) { hb_retl( UpdateWindow( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ) ) ); } -/*-*/ - HB_FUNC( WVG_SHOWWINDOW ) { hb_retl( ShowWindow( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ) ) ); } -/*-*/ - HB_FUNC( WVG_MAKELPARAM ) { hb_retnint( MAKELPARAM( hb_parnint( 1 ), hb_parnint( 2 ) ) ); } -/*-*/ - HB_FUNC( WVG_CREATEWINDOWEX ) { HWND hWnd; @@ -933,7 +797,6 @@ HB_FUNC( WVG_CREATEWINDOWEX ) hb_retnint( ( HB_PTRDIFF ) hWnd ); } -/*-*/ HB_FUNC( WVG_SENDMESSAGETEXT ) { @@ -946,8 +809,6 @@ HB_FUNC( WVG_SENDMESSAGETEXT ) hb_strfree( hBuffer ); } -/*-*/ - HB_FUNC( WVG_GETMESSAGETEXT ) { TCHAR cText[ 32000 ]; @@ -957,8 +818,6 @@ HB_FUNC( WVG_GETMESSAGETEXT ) HB_RETSTR( cText ); } -/*-*/ - HB_FUNC( WVG_SETWNDPROC ) { HWND hWnd = ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ); @@ -974,8 +833,6 @@ HB_FUNC( WVG_SETWNDPROC ) hb_retnint( ( HB_PTRDIFF ) oldProc ); } -/*-*/ - HB_FUNC( WVG_DEFWINDOWPROC ) { hb_retnint( DefWindowProc( wvg_parhwnd( 1 ), @@ -984,8 +841,6 @@ HB_FUNC( WVG_DEFWINDOWPROC ) wvg_parlparam( 4 ) ) ); } -/*-*/ - HB_FUNC( WVG_CALLWINDOWPROC ) { hb_retnint( CallWindowProc( wvg_parwndproc( 1 ), @@ -995,9 +850,7 @@ HB_FUNC( WVG_CALLWINDOWPROC ) wvg_parlparam( 5 ) ) ); } -/*-*/ /* TreeView Functions */ -/*-*/ HB_FUNC( WVG_TREEVIEW_SETTEXTCOLOR ) { @@ -1005,7 +858,6 @@ HB_FUNC( WVG_TREEVIEW_SETTEXTCOLOR ) hb_retl( TreeView_SetTextColor( wvg_parhwnd( 1 ), wvg_parcolor( 2 ) ) ); #endif } -/*-*/ HB_FUNC( WVG_TREEVIEW_SETBKCOLOR ) { @@ -1013,7 +865,6 @@ HB_FUNC( WVG_TREEVIEW_SETBKCOLOR ) hb_retl( TreeView_SetBkColor( wvg_parhwnd( 1 ), wvg_parcolor( 2 ) ) ); #endif } -/*-*/ HB_FUNC( WVG_TREEVIEW_SETLINECOLOR ) { @@ -1021,22 +872,17 @@ HB_FUNC( WVG_TREEVIEW_SETLINECOLOR ) hb_retl( TreeView_SetLineColor( wvg_parhwnd( 1 ), wvg_parcolor( 2 ) ) ); #endif } -/*-*/ HB_FUNC( WVG_TREEVIEW_SELECTITEM ) { hb_retl( TreeView_SelectItem( wvg_parhwnd( 1 ), wvg_parhandle( 2 ) ) ); } -/*-*/ - HB_FUNC( WVG_TREEVIEW_EXPAND ) { hb_retl( TreeView_Expand( wvg_parhwnd( 1 ), wvg_parhandle( 2 ), ( hb_parl( 3 ) ? TVE_EXPAND : TVE_COLLAPSE ) ) ); } -/*-*/ - HB_FUNC( WVG_TVIS_EXPANDED ) { #if 0 @@ -1044,9 +890,7 @@ HB_FUNC( WVG_TVIS_EXPANDED ) #endif } -/*-*/ /* ListBox Functions */ -/*-*/ HB_FUNC( WVG_LBGETTEXT ) { @@ -1057,29 +901,22 @@ HB_FUNC( WVG_LBGETTEXT ) HB_RETSTR( text ); } -/*-*/ - HB_FUNC( WVG_LBGETCURSEL ) { hb_retni( ListBox_GetCurSel( wvg_parhwnd( 1 ) ) ); } -/*-*/ - HB_FUNC( WVG_LBSETCURSEL ) { hb_retni( ListBox_SetCurSel( wvg_parhwnd( 1 ), hb_parni( 2 ) ) ); } -/*-*/ /* Buttons */ -/*-*/ HB_FUNC( WVG_BUTTON_GETCHECK ) { hb_retnl( Button_GetCheck( wvg_parhwnd( 1 ) ) ); } -/*-*/ HB_FUNC( WVG_ISICONIC ) { @@ -1089,7 +926,6 @@ HB_FUNC( WVG_ISICONIC ) hb_retl( HB_FALSE ); #endif } -/*-*/ HB_FUNC( WVG_ISZOOMED ) { @@ -1099,7 +935,7 @@ HB_FUNC( WVG_ISZOOMED ) hb_retl( HB_TRUE ); #endif } -/*-*/ + /* * Win_SetDCBrushColor( hDC, nRGB ) */ @@ -1111,7 +947,7 @@ HB_FUNC( WVG_SETDCBRUSHCOLOR ) wvg_rethandle( NULL ); #endif } -/*-*/ + /* * Win_SetDCPenColor( hDC, nRGB ) */ @@ -1124,7 +960,6 @@ HB_FUNC( WVG_SETDCPENCOLOR ) #endif } -/*-*/ /* * Win_GetCurrentObject( hDC, nObjType ) */ @@ -1133,7 +968,6 @@ HB_FUNC( WVG_GETCURRENTOBJECT ) wvg_rethandle( GetCurrentObject( wvg_parhdc( 1 ), hb_parni( 2 ) ) ); } -/*-*/ /* * Win_GetCurrentBrush( hDC ) */ @@ -1142,7 +976,6 @@ HB_FUNC( WVG_GETCURRENTBRUSH ) wvg_rethandle( GetCurrentObject( wvg_parhdc( 1 ), OBJ_BRUSH ) ); } -/*-*/ /* * Win_GetCurrentFornt( hDC ) */ @@ -1151,40 +984,30 @@ HB_FUNC( WVG_GETCURRENTFONT ) wvg_rethandle( GetCurrentObject( wvg_parhdc( 1 ), OBJ_FONT ) ); } -/*-*/ - HB_FUNC( WVG_SETWINDOWPOSTOBACK ) { hb_retl( SetWindowPos( wvg_parhwnd( 1 ), HWND_BOTTOM, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE ) ); } -/*-*/ - HB_FUNC( WVG_SETWINDOWPOSTOTOP ) { hb_retl( SetWindowPos( wvg_parhwnd( 1 ), HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE ) ); } -/*-*/ - HB_FUNC( WVG_SETWINDOWSIZE ) { hb_retl( SetWindowPos( wvg_parhwnd( 1 ), NULL, 0, 0, hb_parni( 2 ), hb_parni( 3 ), hb_parl( 4 ) ? 0 : SWP_NOREDRAW | SWP_NOZORDER | SWP_NOMOVE | SWP_NOACTIVATE ) ); } -/*-*/ - HB_FUNC( WVG_SETWINDOWPOSITION ) { hb_retl( SetWindowPos( wvg_parhwnd( 1 ), NULL, hb_parni( 2 ), hb_parni( 3 ), 0, 0, hb_parl( 4 ) ? 0 : SWP_NOREDRAW | SWP_NOZORDER | SWP_NOSIZE | SWP_NOACTIVATE ) ); } -/*-*/ - HB_FUNC( WVG_SETWINDOWPOSANDSIZE ) { hb_retl( SetWindowPos( wvg_parhwnd( 1 ), NULL, hb_parni( 2 ), hb_parni( 3 ), @@ -1192,14 +1015,11 @@ HB_FUNC( WVG_SETWINDOWPOSANDSIZE ) ( hb_parl( 6 ) ? 0 : SWP_NOREDRAW ) | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED ) ); } -/*-*/ - HB_FUNC( WVG_POSTMESSAGE ) { hb_retl( PostMessage( wvg_parhwnd( 1 ), hb_parni( 2 ), ( WPARAM ) hb_parni( 3 ), ( LPARAM ) hb_parni( 4 ) ) ); } -/*-*/ /* * Win_SetLayeredWindowAttributes( hWnd, nRGB, nOpacityFactor [0-255] ) */ @@ -1230,8 +1050,6 @@ HB_FUNC( WVG_SETLAYEREDWINDOWATTRIBUTES ) #endif } -/*-*/ - HB_FUNC( WVG_SENDTOOLBARMESSAGE ) { /* #if ! defined( HB_OS_WIN_CE ) */ @@ -1419,8 +1237,6 @@ HB_FUNC( WVG_SENDTOOLBARMESSAGE ) /* #endif */ } -/*-*/ - HB_FUNC( WVG_SENDEDITCONTROLMESSAGE ) { HWND hED = hbwapi_par_raw_HWND( 1 ); @@ -1438,8 +1254,6 @@ HB_FUNC( WVG_SENDEDITCONTROLMESSAGE ) } } -/*-*/ - HB_FUNC( WVG_SENDCBMESSAGE ) { HWND hCB = hbwapi_par_raw_HWND( 1 ); @@ -1638,5 +1452,3 @@ HB_FUNC( WVG_SENDCBMESSAGE ) if( hText ) hb_strfree( hText ); } - -/*-*/ diff --git a/harbour/contrib/gtwvg/wvgwing.c b/harbour/contrib/gtwvg/wvgwing.c index 1df16ce27c..60680416b3 100644 --- a/harbour/contrib/gtwvg/wvgwing.c +++ b/harbour/contrib/gtwvg/wvgwing.c @@ -63,16 +63,10 @@ * If you do not wish that, delete this exception notice. * */ -/*-*/ -/*-*/ -/*-*/ -/*-*/ + /* * Direct WinApi Functions - Prefixed WIN_*() */ -/*-*/ -/*-*/ -/*-*/ #if defined( __BORLANDC__ ) # if ! defined( NONAMELESSUNION ) @@ -116,8 +110,6 @@ #define WIN_STATUSBAR_MAX_PARTS 256 -/*-*/ - #define wvg_parwparam( n ) ( ( WPARAM ) ( HB_PTRDIFF ) hb_parnint( n ) ) #define wvg_parlparam( n ) ( ( LPARAM ) ( HB_PTRDIFF ) hb_parnint( n ) ) #define wvg_parhandle( n ) ( ( HANDLE ) ( HB_PTRDIFF ) hb_parnint( n ) ) @@ -129,16 +121,12 @@ #define wvg_rethandle( n ) ( hb_retnint( ( HB_PTRDIFF ) n ) ) -/*-*/ - #if defined( __BORLANDC__ ) && ! defined( HB_ARCH_64BIT ) #undef MAKELONG #define MAKELONG( a, b ) ( ( LONG ) ( ( ( WORD ) ( ( DWORD_PTR ) ( a ) & 0xffff ) ) | \ ( ( ( DWORD ) ( ( WORD ) ( ( DWORD_PTR ) ( b ) & 0xffff ) ) ) << 16 ) ) ) #endif -/*-*/ - static HINSTANCE wvg_hInstance( void ) { HANDLE hInstance; @@ -148,18 +136,14 @@ static HINSTANCE wvg_hInstance( void ) return ( HINSTANCE ) hInstance; } -/*-*/ - HB_FUNC( WVG_HINSTANCE ) { hbwapi_ret_raw_HANDLE( wvg_hInstance() ); } -/*-*/ /* * Bitmap Management Function . Coutesy GTWVW */ -/*-*/ static BITMAPINFO * PackedDibLoad( LPCTSTR szFileName ) { @@ -438,7 +422,6 @@ static HBITMAP hPrepareBitmap( LPCTSTR szBitmap, UINT uiBitmap, return hBitmap; } -/*-*/ HB_FUNC( WVG_PREPAREBITMAPFROMFILE ) { @@ -451,8 +434,6 @@ HB_FUNC( WVG_PREPAREBITMAPFROMFILE ) hb_retptr( ( void * ) hBitmap ); } -/*-*/ - HB_FUNC( WVG_PREPAREBITMAPFROMRESOURCEID ) { HBITMAP hBitmap; @@ -463,8 +444,6 @@ HB_FUNC( WVG_PREPAREBITMAPFROMRESOURCEID ) hb_retptr( ( void * ) hBitmap ); } -/*-*/ - HB_FUNC( WVG_PREPAREBITMAPFROMRESOURCENAME ) { HBITMAP hBitmap; @@ -475,7 +454,6 @@ HB_FUNC( WVG_PREPAREBITMAPFROMRESOURCENAME ) hb_strfree( hText ); hb_retptr( ( void * ) hBitmap ); } -/*-*/ HB_FUNC( WVG_STATUSBARCREATEPANEL ) { @@ -533,8 +511,6 @@ HB_FUNC( WVG_STATUSBARCREATEPANEL ) hb_retl( HB_FALSE ); } -/*-*/ - HB_FUNC( WVG_STATUSBARSETTEXT ) { HWND hWndSB = ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ); @@ -556,8 +532,6 @@ HB_FUNC( WVG_STATUSBARSETTEXT ) } } -/*-*/ - HB_FUNC( WVG_STATUSBARREFRESH ) { #if 0 @@ -582,7 +556,6 @@ HB_FUNC( WVG_STATUSBARREFRESH ) #endif } -/*-*/ /* * Wvg_GetNMHInfo( nlParam ) */ @@ -599,7 +572,7 @@ HB_FUNC( WVG_GETNMHDRINFO ) hb_itemReturnRelease( pEvParams ); } -/*-*/ + /* * Wvg_GetNMMouseInfo( nlParam ) */ @@ -618,7 +591,7 @@ HB_FUNC( WVG_GETNMMOUSEINFO ) hb_itemReturnRelease( pEvParams ); } -/*-*/ + /* * Wvg_GetNMTreeViewInfo( nlParam ) */ @@ -638,7 +611,7 @@ HB_FUNC( WVG_GETNMTREEVIEWINFO ) hb_itemReturnRelease( pEvParams ); } -/*-*/ + /* * Wvg_TreeView_GetSelectionInfo( ::hWnd, nlParam, @cParent, @cText, @hParentOfSelected, @hItemSelected ) */ @@ -677,7 +650,7 @@ HB_FUNC( WVG_TREEVIEW_GETSELECTIONINFO ) } } -/*-*/ + /* * hItem := Wvg_TreeView_AddItem( oItem:hTree, hParent, oItem:Caption ) */ @@ -702,8 +675,6 @@ HB_FUNC( WVG_TREEVIEW_ADDITEM ) hb_strfree( hText ); } -/*-*/ - HB_FUNC( WVG_TREEVIEW_SHOWEXPANDED ) { HWND hwnd = wvg_parhwnd( 1 ); @@ -754,9 +725,7 @@ HB_FUNC( WVG_TREEVIEW_SHOWEXPANDED ) } } -/*-*/ /* WvgFontDialog() */ -/*-*/ PHB_ITEM wvg_logfontTOarray( LPLOGFONT lf, HB_BOOL bEmpty ) { @@ -803,9 +772,7 @@ PHB_ITEM wvg_logfontTOarray( LPLOGFONT lf, HB_BOOL bEmpty ) return aFont; } -/*-*/ /* An Alternative to WndProc Callbacks */ -/*-*/ BOOL CALLBACK WvgDialogProcChooseFont( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { @@ -846,7 +813,6 @@ BOOL CALLBACK WvgDialogProcChooseFont( HWND hwnd, UINT msg, WPARAM wParam, LPARA return bret; } -/*-*/ /* * Wvg_ChooseFont( hWnd, nWndProc, familyName, nominalPointSize,; * viewScreenFonts, viewPrinterFonts ) @@ -935,8 +901,6 @@ HB_FUNC( WVG_CHOOSEFONT ) #endif } -/*-*/ - HB_FUNC( WVG_CHOOSEFONT_GETLOGFONT ) { #if ! defined( HB_OS_WIN_CE ) @@ -953,8 +917,6 @@ HB_FUNC( WVG_CHOOSEFONT_GETLOGFONT ) #endif } -/*-*/ - HB_FUNC( WVG_FONTCREATE ) { LOGFONT lf; @@ -998,7 +960,6 @@ HB_FUNC( WVG_FONTCREATE ) hb_itemReturnRelease( aFont ); } -/*-*/ /* * Wvg_PointSizeToHeight( hdc, nPointSize ) */ @@ -1012,7 +973,6 @@ HB_FUNC( WVG_POINTSIZETOHEIGHT ) ReleaseDC( GetDesktopWindow(), hdc ); } -/*-*/ /* * Wvg_HeightToPointSize( hdc, nHeight ) */ @@ -1026,7 +986,6 @@ HB_FUNC( WVG_HEIGHTTOPOINTSIZE ) ReleaseDC( GetDesktopWindow(), hdc ); } -/*-*/ HB_FUNC( WVG_SETCURRENTBRUSH ) { #if ! defined( HB_OS_WIN_CE ) @@ -1037,7 +996,7 @@ HB_FUNC( WVG_SETCURRENTBRUSH ) #endif #endif } -/*-*/ + /* * IL | DL * Wvg_AddToolbarButton( hWndTB, nBtn|hBitmap, cCaption, nButtonID, nMode, lIsTooltip ) @@ -1100,7 +1059,6 @@ HB_FUNC( WVG_ADDTOOLBARBUTTON ) } } -/*-*/ /* * Wvg_RegisterClass( cClassName, */ @@ -1126,7 +1084,6 @@ HB_FUNC( WVG_REGISTERCLASS_BYNAME ) hb_strfree( hClass ); } -/*-*/ /* * Function with Win_FillRect() exists in hbwin:win_parn1.c with different approach. */ @@ -1142,8 +1099,6 @@ HB_FUNC( WVG_FILLRECT ) FillRect( wvg_parhdc( 1 ), &rc, wvg_parhbrush( 3 ) ); } -/*-*/ - HB_FUNC( WVG_BEGINMOUSETRACKING ) { #if ! defined( HB_OS_WIN_CE ) @@ -1159,8 +1114,6 @@ HB_FUNC( WVG_BEGINMOUSETRACKING ) #endif } -/*-*/ - LRESULT CALLBACK ControlWindowProcedure( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { PHB_ITEM pBlock = ( PHB_ITEM ) GetProp( hwnd, TEXT( "BLOCKCALLBACK" ) ); @@ -1189,8 +1142,6 @@ LRESULT CALLBACK ControlWindowProcedure( HWND hwnd, UINT msg, WPARAM wParam, LPA return DefWindowProc( hwnd, msg, wParam, lParam ); } -/*-*/ - HB_FUNC( WVG_SETWINDOWPROCBLOCK ) { WNDPROC oldProc; @@ -1208,8 +1159,6 @@ HB_FUNC( WVG_SETWINDOWPROCBLOCK ) hb_retnint( ( HB_PTRDIFF ) oldProc ); } -/*-*/ - HB_FUNC( WVG_RELEASEWINDOWPROCBLOCK ) { HWND hWnd = hbwapi_par_raw_HWND( 1 ); @@ -1219,7 +1168,6 @@ HB_FUNC( WVG_RELEASEWINDOWPROCBLOCK ) hb_itemRelease( pBlock ); } -/*-*/ /* WVG_CreateTooltipWindow( hControl ) -> hWndTT */ @@ -1252,8 +1200,6 @@ HB_FUNC( WVG_CREATETOOLTIPWINDOW ) wvg_rethandle( NULL ); } -/*-*/ - HB_FUNC( WVG_SETTOOLTIPTEXT ) { TOOLINFO toolInfo; @@ -1270,5 +1216,3 @@ HB_FUNC( WVG_SETTOOLTIPTEXT ) hb_strfree( hText ); } - -/*-*/ diff --git a/harbour/contrib/gtwvg/wvtwin.ch b/harbour/contrib/gtwvg/wvtwin.ch index 9c752fe3f5..766a1fcdce 100644 --- a/harbour/contrib/gtwvg/wvtwin.ch +++ b/harbour/contrib/gtwvg/wvtwin.ch @@ -49,19 +49,17 @@ * If you do not wish that, delete this exception notice. * */ -/*-*/ + #ifndef _WVGWIN_CH #define _WVGWIN_CH -/*-*/ + // // GTWVT Specific // -/*-*/ -#xtranslate MAKELONG(, ) => (() + () * 65536) -#xtranslate MAKELPARAM(, ) => (() + () * 65536) +#xtranslate MAKELONG( , ) => ( ( ) + ( ) * 65536 ) +#xtranslate MAKELPARAM( , ) => ( ( ) + ( ) * 65536 ) -/*-*/ /* * Wvt_DrawButton() constants */ @@ -75,7 +73,6 @@ #define WVT_BTN_IMAGE_BOTTOM 2 #define WVT_BTN_IMAGE_RIGHT 3 -/*-*/ /* * Wvt_DrawLine( nTop, nLeft, nBottom, nRight, nOrient, nFormat,; * nAlign, nStyle, nThick, nColor ) @@ -103,7 +100,6 @@ #define WVT_LINE_DASHDOT 3 #define WVT_LINE_DASHDOTDOT 4 -/*-*/ // // Standard Mouse Pointer Shape Constants // @@ -188,7 +184,6 @@ #define WVT_SCROLLBUTTON_RIGHT 4 #define WVT_SCROLL_THUMB 5 -/*-*/ // // wvtmenu defines . Peter Rees // @@ -200,13 +195,12 @@ /*-*/ -#define RGB( nR,nG,nB ) ( nR + ( nG * 256 ) + ( nB * 256 * 256 ) ) +#define RGB( nR, nG, nB ) ( nR + ( nG * 256 ) + ( nB * 256 * 256 ) ) -/*-*/ // // Windows Specific // -/*-*/ + #define LVM_FIRST 0x1000 // ListView messages #define TV_FIRST 0x1100 // TreeView messages #define TVN_FIRST (0-400) @@ -215,7 +209,7 @@ #define CCM_FIRST 0x2000 -#define CCM_LAST (CCM_FIRST+0x200) +#define CCM_LAST ( CCM_FIRST + 0x200 ) #define CCM_SETBKCOLOR 8193 #define CCM_SETCOLORSCHEME 8194 #define CCM_GETCOLORSCHEME 8195 @@ -228,12 +222,10 @@ #define CCM_SETWINDOWTHEME 0x200b #define CCM_DPISCALE 0x200c -/*-*/ - -/*-*/ // // Menu Manipulation Constants // + #define MF_INSERT 0 #define MF_CHANGE 128 #define MF_APPEND 256 @@ -282,7 +274,6 @@ #define TPM_NONOTIFY 0x0080 /* Don't send any notification msgs */ #define TPM_RETURNCMD 0x0100 -/*-*/ /* * ShowWindow() Commands */ @@ -302,7 +293,6 @@ #define SW_FORCEMINIMIZE 11 #define SW_MAX 11 -/*-*/ /* * Window Messages */ @@ -490,7 +480,6 @@ #define WM_PALETTECHANGED 785 #define WM_HOTKEY 786 -/*-*/ /* * Window Styles */ @@ -521,14 +510,13 @@ #define WS_SIZEBOX WS_THICKFRAME #define WS_TILEDWINDOW WS_OVERLAPPEDWINDOW -#define WS_OVERLAPPEDWINDOW (WS_OVERLAPPED + ; - WS_CAPTION + ; - WS_SYSMENU + ; - WS_THICKFRAME + ; - WS_MINIMIZEBOX + ; - WS_MAXIMIZEBOX ) +#define WS_OVERLAPPEDWINDOW ( WS_OVERLAPPED + ; + WS_CAPTION + ; + WS_SYSMENU + ; + WS_THICKFRAME + ; + WS_MINIMIZEBOX + ; + WS_MAXIMIZEBOX ) -/*-*/ /* * Extended Window Styles */ @@ -554,8 +542,8 @@ #define WS_EX_STATICEDGE 131072 // 0x00020000L #define WS_EX_APPWINDOW 262144 // 0x00040000L -#define WS_EX_OVERLAPPEDWINDOW (WS_EX_WINDOWEDGE + WS_EX_CLIENTEDGE) -#define WS_EX_PALETTEWINDOW (WS_EX_WINDOWEDGE + WS_EX_TOOLWINDOW + WS_EX_TOPMOST) +#define WS_EX_OVERLAPPEDWINDOW ( WS_EX_WINDOWEDGE + WS_EX_CLIENTEDGE ) +#define WS_EX_PALETTEWINDOW ( WS_EX_WINDOWEDGE + WS_EX_TOOLWINDOW + WS_EX_TOPMOST ) #define WS_EX_LAYERED 524288 // 0x00080000 #define WS_EX_NOINHERITLAYOUT 1048576 // 0x00100000L // Disable inheritence of mirroring by children @@ -585,7 +573,6 @@ #define SC_CONTEXTHELP 61824 // 0xF180 #define SC_SEPARATOR 61455 // 0xF00F -/*-*/ /* * Dialog styles */ @@ -603,7 +590,6 @@ #define DS_CENTERMOUSE 4096 // 0x1000 #define DS_CONTEXTHELP 8192 // 0x2000 -/*-*/ /* * Dialog Box Command IDs */ @@ -614,11 +600,9 @@ #define IDIGNORE 5 #define IDYES 6 #define IDNO 7 -#define IDTRYAGAIN 10 // (WINVER >= 0x0500) -#define IDCONTINUE 11 // (WINVER >= 0x0500) +#define IDTRYAGAIN 10 // WINVER >= 0x0500 +#define IDCONTINUE 11 // WINVER >= 0x0500 -/*-*/ -/*-*/ /* * Button Control Styles */ @@ -650,7 +634,6 @@ #define BS_FLAT 32768 // 0x00008000L #define BS_RIGHTBUTTON BS_LEFTTEXT -/*-*/ /* * User Button Notification Codes */ @@ -666,7 +649,6 @@ #define BN_SETFOCUS 6 #define BN_KILLFOCUS 7 -/*-*/ /* * Button Control Messages */ @@ -685,8 +667,6 @@ #define BST_PUSHED 4 #define BST_FOCUS 8 -/*-*/ -/*-*/ /* * Edit Control Styles */ @@ -705,7 +685,6 @@ #define ES_WANTRETURN 4096 #define ES_NUMBER 8192 -/*-*/ /* * Edit Control Notification Codes */ @@ -718,7 +697,6 @@ #define EN_HSCROLL 1537 // 0x0601 #define EN_VSCROLL 1538 // 0x0602 -/*-*/ /* * Edit Control Messages */ @@ -760,8 +738,6 @@ #define EM_POSFROMCHAR 214 #define EM_CHARFROMPOS 215 -/*-*/ -/*-*/ /* * Combo Box styles */ @@ -779,11 +755,10 @@ #define CBS_UPPERCASE 8192 // 0x2000L #define CBS_LOWERCASE 16384 // 0x4000L -/*-*/ /* * Combo Box Notification Codes */ -#define CBN_ERRSPACE (-1) +#define CBN_ERRSPACE ( -1 ) #define CBN_SELCHANGE 1 #define CBN_DBLCLK 2 #define CBN_SETFOCUS 3 @@ -795,7 +770,6 @@ #define CBN_SELENDOK 9 #define CBN_SELENDCANCEL 10 -/*-*/ /* * Combo Box messages */ @@ -838,16 +812,13 @@ #define CB_MSGMAX 0x0165 -/*-*/ /* * Combo Box return Values */ #define CB_OKAY 0 -#define CB_ERR (-1) -#define CB_ERRSPACE (-2) +#define CB_ERR ( -1 ) +#define CB_ERRSPACE ( -2 ) -/*-*/ -/*-*/ /* * Static Control Constants */ @@ -883,7 +854,6 @@ #define SS_WORDELLIPSIS 49152 #define SS_ELLIPSISMASK 49152 -/*-*/ /* * Static Control Mesages */ @@ -897,7 +867,6 @@ #define STN_ENABLE 2 #define STN_DISABLE 3 -/*-*/ /* * Listbox messages */ @@ -942,7 +911,6 @@ #define LB_INITSTORAGE 424 #define LB_ITEMFROMPOINT 425 -/*-*/ /* * Listbox Styles */ @@ -963,18 +931,16 @@ #define LBS_NOSEL 16384 #define LBS_STANDARD ( LBS_NOTIFY + LBS_SORT + WS_VSCROLL + WS_BORDER ) -/*-*/ /* * Listbox Notification Codes */ -#define LBN_ERRSPACE (-2) +#define LBN_ERRSPACE ( -2 ) #define LBN_SELCHANGE 1 #define LBN_DBLCLK 2 #define LBN_SELCANCEL 3 #define LBN_SETFOCUS 4 #define LBN_KILLFOCUS 5 -/*-*/ /* * MessageBox() Flags */ @@ -1022,7 +988,6 @@ #define MB_MODEMASK 12288 #define MB_MISCMASK 49152 -/*-*/ /* * Stock Logical Objects */ @@ -1047,7 +1012,6 @@ #define SYSTEM_FIXED_FONT 16 #define DEFAULT_GUI_FONT 17 -/*-*/ /* * WM_SETICON / WM_GETICON Type Codes */ @@ -1061,7 +1025,6 @@ #define IMAGE_CURSOR 2 #define IMAGE_ENHMETAFILE 3 -/*-*/ /* * DrawText() Format Flags */ @@ -1090,7 +1053,6 @@ #define DT_HIDEPREFIX 1048576 #define DT_PREFIXONLY 2097152 -/*-*/ /* * Brush Styles */ @@ -1140,7 +1102,6 @@ #define PS_GEOMETRIC 65536 #define PS_TYPE_MASK 983040 -/*-*/ // font weight values #define FW_DONTCARE 0 #define FW_THIN 100 @@ -1158,7 +1119,6 @@ #define FW_HEAVY 900 #define FW_BLACK 900 -/*-*/ // font quality values #define DEFAULT_QUALITY 0 #define DRAFT_QUALITY 1 @@ -1194,7 +1154,6 @@ #define PRINTER_FONTTYPE 16384 // 0x4000 #define SIMULATED_FONTTYPE 32768 // 0x8000 -/*-*/ // flags (CHOOSECOLOR structure) #define CC_RGBINIT 1 // 0x00000001 #define CC_FULLOPEN 2 // 0x00000002 @@ -1206,17 +1165,16 @@ #define CC_SOLIDCOLOR 128 // 0x00000080 // WINVER >= 0x0400 #define CC_ANYCOLOR 256 // 0x00000100 // WINVER >= 0x0400 -/*-*/ /* * Window field offsets for GetWindowLong() */ -#define GWL_WNDPROC (-4) -#define GWL_HINSTANCE (-6) -#define GWL_HWNDPARENT (-8) -#define GWL_STYLE (-16) -#define GWL_EXSTYLE (-20) -#define GWL_USERDATA (-21) -#define GWL_ID (-12) +#define GWL_WNDPROC ( -4 ) +#define GWL_HINSTANCE ( -6 ) +#define GWL_HWNDPARENT ( -8 ) +#define GWL_STYLE ( -16 ) +#define GWL_EXSTYLE ( -20 ) +#define GWL_USERDATA ( -21 ) +#define GWL_ID ( -12 ) #define DWL_MSGRESULT 0 #define DWL_DLGPROC 4 @@ -1298,7 +1256,6 @@ #define VK_NUMLOCK 144 #define VK_SCROLL 145 -/*-*/ /* * File Open/Save Dialog Constants */ @@ -1329,7 +1286,6 @@ #define OFN_DONTADDTORECENT 33554432 #define OFN_FORCESHOWHIDDEN 268435456 // Show All files including System and hidden files -/*-*/ /* Common Control Constants */ #define CCS_TOP 1 #define CCS_NOMOVEY 2 @@ -1339,76 +1295,76 @@ #define CCS_ADJUSTABLE 32 #define CCS_NODIVIDER 64 #define CCS_VERT 128 -#define CCS_LEFT (CCS_VERT + CCS_TOP) -#define CCS_RIGHT (CCS_VERT + CCS_BOTTOM) -#define CCS_NOMOVEX (CCS_VERT + CCS_NOMOVEY) +#define CCS_LEFT ( CCS_VERT + CCS_TOP ) +#define CCS_RIGHT ( CCS_VERT + CCS_BOTTOM ) +#define CCS_NOMOVEX ( CCS_VERT + CCS_NOMOVEY ) #define TOOLBARCLASSNAME "ToolbarWindow32" #define STATUSCLASSNAME "msctls_statusbar32" /* Toolbar messages */ -#define TB_ADDBITMAP (WM_USER + 19) -#define TB_SAVERESTOREA (WM_USER + 26) -#define TB_SAVERESTOREW (WM_USER + 76) -#define TB_CUSTOMIZE (WM_USER + 27) -#define TB_ADDSTRINGA (WM_USER + 28) -#define TB_ADDSTRINGW (WM_USER + 77) -#define TB_GETITEMRECT (WM_USER + 29) -#define TB_BUTTONSTRUCTSIZE (WM_USER + 30) -#define TB_SETBUTTONSIZE (WM_USER + 31) -#define TB_SETBITMAPSIZE (WM_USER + 32) -#define TB_AUTOSIZE (WM_USER + 33) -#define TB_GETTOOLTIPS (WM_USER + 35) -#define TB_SETTOOLTIPS (WM_USER + 36) -#define TB_SETPARENT (WM_USER + 37) -#define TB_SETROWS (WM_USER + 39) -#define TB_GETROWS (WM_USER + 40) -#define TB_GETBITMAPFLAGS (WM_USER + 41) -#define TB_SETCMDID (WM_USER + 42) -#define TB_CHANGEBITMAP (WM_USER + 43) -#define TB_GETBITMAP (WM_USER + 44) -#define TB_GETBUTTONTEXTA (WM_USER + 45) -#define TB_GETBUTTONTEXTW (WM_USER + 75) -#define TB_REPLACEBITMAP (WM_USER + 46) -#define TB_SETINDENT (WM_USER + 47) -#define TB_SETIMAGELIST (WM_USER + 48) -#define TB_GETIMAGELIST (WM_USER + 49) -#define TB_LOADIMAGES (WM_USER + 50) -#define TB_GETRECT (WM_USER + 51) // wParam is the Cmd instead of index -#define TB_SETHOTIMAGELIST (WM_USER + 52) -#define TB_GETHOTIMAGELIST (WM_USER + 53) -#define TB_SETDISABLEDIMAGELIST (WM_USER + 54) -#define TB_GETDISABLEDIMAGELIST (WM_USER + 55) -#define TB_SETSTYLE (WM_USER + 56) -#define TB_GETSTYLE (WM_USER + 57) -#define TB_GETBUTTONSIZE (WM_USER + 58) -#define TB_SETBUTTONWIDTH (WM_USER + 59) -#define TB_SETMAXTEXTROWS (WM_USER + 60) -#define TB_GETTEXTROWS (WM_USER + 61) +#define TB_ADDBITMAP ( WM_USER + 19 ) +#define TB_SAVERESTOREA ( WM_USER + 26 ) +#define TB_SAVERESTOREW ( WM_USER + 76 ) +#define TB_CUSTOMIZE ( WM_USER + 27 ) +#define TB_ADDSTRINGA ( WM_USER + 28 ) +#define TB_ADDSTRINGW ( WM_USER + 77 ) +#define TB_GETITEMRECT ( WM_USER + 29 ) +#define TB_BUTTONSTRUCTSIZE ( WM_USER + 30 ) +#define TB_SETBUTTONSIZE ( WM_USER + 31 ) +#define TB_SETBITMAPSIZE ( WM_USER + 32 ) +#define TB_AUTOSIZE ( WM_USER + 33 ) +#define TB_GETTOOLTIPS ( WM_USER + 35 ) +#define TB_SETTOOLTIPS ( WM_USER + 36 ) +#define TB_SETPARENT ( WM_USER + 37 ) +#define TB_SETROWS ( WM_USER + 39 ) +#define TB_GETROWS ( WM_USER + 40 ) +#define TB_GETBITMAPFLAGS ( WM_USER + 41 ) +#define TB_SETCMDID ( WM_USER + 42 ) +#define TB_CHANGEBITMAP ( WM_USER + 43 ) +#define TB_GETBITMAP ( WM_USER + 44 ) +#define TB_GETBUTTONTEXTA ( WM_USER + 45 ) +#define TB_GETBUTTONTEXTW ( WM_USER + 75 ) +#define TB_REPLACEBITMAP ( WM_USER + 46 ) +#define TB_SETINDENT ( WM_USER + 47 ) +#define TB_SETIMAGELIST ( WM_USER + 48 ) +#define TB_GETIMAGELIST ( WM_USER + 49 ) +#define TB_LOADIMAGES ( WM_USER + 50 ) +#define TB_GETRECT ( WM_USER + 51 ) // wParam is the Cmd instead of index +#define TB_SETHOTIMAGELIST ( WM_USER + 52 ) +#define TB_GETHOTIMAGELIST ( WM_USER + 53 ) +#define TB_SETDISABLEDIMAGELIST ( WM_USER + 54 ) +#define TB_GETDISABLEDIMAGELIST ( WM_USER + 55 ) +#define TB_SETSTYLE ( WM_USER + 56 ) +#define TB_GETSTYLE ( WM_USER + 57 ) +#define TB_GETBUTTONSIZE ( WM_USER + 58 ) +#define TB_SETBUTTONWIDTH ( WM_USER + 59 ) +#define TB_SETMAXTEXTROWS ( WM_USER + 60 ) +#define TB_GETTEXTROWS ( WM_USER + 61 ) #define TB_GETBUTTONTEXT TB_GETBUTTONTEXTW #define TB_SAVERESTORE TB_SAVERESTOREW #define TB_ADDSTRING TB_ADDSTRINGW -#define TB_GETOBJECT (WM_USER + 62) // wParam == IID, lParam void **ppv -#define TB_GETHOTITEM (WM_USER + 71) -#define TB_SETHOTITEM (WM_USER + 72) // wParam == iHotItem -#define TB_SETANCHORHIGHLIGHT (WM_USER + 73) // wParam == TRUE/FALSE -#define TB_GETANCHORHIGHLIGHT (WM_USER + 74) -#define TB_MAPACCELERATORA (WM_USER + 78) // wParam == ch, lParam int * pidBtn +#define TB_GETOBJECT ( WM_USER + 62 ) // wParam == IID, lParam void **ppv +#define TB_GETHOTITEM ( WM_USER + 71 ) +#define TB_SETHOTITEM ( WM_USER + 72 ) // wParam == iHotItem +#define TB_SETANCHORHIGHLIGHT ( WM_USER + 73 ) // wParam == TRUE/FALSE +#define TB_GETANCHORHIGHLIGHT ( WM_USER + 74 ) +#define TB_MAPACCELERATORA ( WM_USER + 78 ) // wParam == ch, lParam int * pidBtn -#define TB_GETINSERTMARK (WM_USER + 79) // lParam == LPTBINSERTMARK -#define TB_SETINSERTMARK (WM_USER + 80) // lParam == LPTBINSERTMARK -#define TB_INSERTMARKHITTEST (WM_USER + 81) // wParam == LPPOINT lParam == LPTBINSERTMARK -#define TB_MOVEBUTTON (WM_USER + 82) -#define TB_GETMAXSIZE (WM_USER + 83) // lParam == LPSIZE -#define TB_SETEXTENDEDSTYLE (WM_USER + 84) // For TBSTYLE_EX_* -#define TB_GETEXTENDEDSTYLE (WM_USER + 85) // For TBSTYLE_EX_* -#define TB_GETPADDING (WM_USER + 86) -#define TB_SETPADDING (WM_USER + 87) -#define TB_SETINSERTMARKCOLOR (WM_USER + 88) -#define TB_GETINSERTMARKCOLOR (WM_USER + 89) +#define TB_GETINSERTMARK ( WM_USER + 79 ) // lParam == LPTBINSERTMARK +#define TB_SETINSERTMARK ( WM_USER + 80 ) // lParam == LPTBINSERTMARK +#define TB_INSERTMARKHITTEST ( WM_USER + 81 ) // wParam == LPPOINT lParam == LPTBINSERTMARK +#define TB_MOVEBUTTON ( WM_USER + 82 ) +#define TB_GETMAXSIZE ( WM_USER + 83 ) // lParam == LPSIZE +#define TB_SETEXTENDEDSTYLE ( WM_USER + 84 ) // For TBSTYLE_EX_* +#define TB_GETEXTENDEDSTYLE ( WM_USER + 85 ) // For TBSTYLE_EX_* +#define TB_GETPADDING ( WM_USER + 86 ) +#define TB_SETPADDING ( WM_USER + 87 ) +#define TB_SETINSERTMARKCOLOR ( WM_USER + 88 ) +#define TB_GETINSERTMARKCOLOR ( WM_USER + 89 ) #define TB_SETCOLORSCHEME CCM_SETCOLORSCHEME // lParam is color scheme #define TB_GETCOLORSCHEME CCM_GETCOLORSCHEME // fills in COLORSCHEME pointed to by lParam @@ -1416,7 +1372,7 @@ #define TB_SETUNICODEFORMAT CCM_SETUNICODEFORMAT #define TB_GETUNICODEFORMAT CCM_GETUNICODEFORMAT -#define TB_MAPACCELERATORW (WM_USER + 90) // wParam == ch, lParam int * pidBtn +#define TB_MAPACCELERATORW ( WM_USER + 90 ) // wParam == ch, lParam int * pidBtn #define TB_MAPACCELERATOR TB_MAPACCELERATORW #define TBIMHT_AFTER 1 // TRUE = insert After iButton, otherwise before @@ -1437,47 +1393,47 @@ #define TBBUTTONINFO TBBUTTONINFOW #define LPTBBUTTONINFO LPTBBUTTONINFOW -#define TB_GETBUTTONINFOW (WM_USER + 63) -#define TB_SETBUTTONINFOW (WM_USER + 64) -#define TB_GETBUTTONINFOA (WM_USER + 65) -#define TB_SETBUTTONINFOA (WM_USER + 66) +#define TB_GETBUTTONINFOW ( WM_USER + 63 ) +#define TB_SETBUTTONINFOW ( WM_USER + 64 ) +#define TB_GETBUTTONINFOA ( WM_USER + 65 ) +#define TB_SETBUTTONINFOA ( WM_USER + 66 ) #define TB_GETBUTTONINFO TB_GETBUTTONINFOW #define TB_SETBUTTONINFO TB_SETBUTTONINFOW -#define TB_INSERTBUTTONW (WM_USER + 67) -#define TB_ADDBUTTONSW (WM_USER + 68) -#define TB_ADDBUTTONSA (WM_USER + 20) -#define TB_HITTEST (WM_USER + 69) +#define TB_INSERTBUTTONW ( WM_USER + 67 ) +#define TB_ADDBUTTONSW ( WM_USER + 68 ) +#define TB_ADDBUTTONSA ( WM_USER + 20 ) +#define TB_HITTEST ( WM_USER + 69 ) #define TB_INSERTBUTTON TB_INSERTBUTTONW #define TB_ADDBUTTONS TB_ADDBUTTONSW -#define TB_SETDRAWTEXTFLAGS (WM_USER + 70) -#define TB_GETSTRING (WM_USER + 92) +#define TB_SETDRAWTEXTFLAGS ( WM_USER + 70 ) +#define TB_GETSTRING ( WM_USER + 92 ) -#define TBN_FIRST (-700) -#define TBN_GETBUTTONINFOA (TBN_FIRST-0) -#define TBN_BEGINDRAG (TBN_FIRST-1) -#define TBN_ENDDRAG (TBN_FIRST-2) -#define TBN_BEGINADJUST (TBN_FIRST-3) -#define TBN_ENDADJUST (TBN_FIRST-4) -#define TBN_RESET (TBN_FIRST-5) -#define TBN_QUERYINSERT (TBN_FIRST-6) -#define TBN_QUERYDELETE (TBN_FIRST-7) -#define TBN_TOOLBARCHANGE (TBN_FIRST-8) -#define TBN_CUSTHELP (TBN_FIRST-9) -#define TBN_DROPDOWN (TBN_FIRST-10) -#define TBN_GETOBJECT (TBN_FIRST-12) -#define TBN_HOTITEMCHANGE (TBN_FIRST-13) -#define TBN_DRAGOUT (TBN_FIRST-14) -#define TBN_DELETINGBUTTON (TBN_FIRST-15) -#define TBN_GETDISPINFOA (TBN_FIRST-16) -#define TBN_GETDISPINFOW (TBN_FIRST-17) -#define TBN_GETINFOTIPA (TBN_FIRST-18) -#define TBN_GETINFOTIPW (TBN_FIRST-19) -#define TBN_GETBUTTONINFOW (TBN_FIRST-20) -#define TBN_RESTORE (TBN_FIRST-21) -#define TBN_SAVE (TBN_FIRST-22) -#define TBN_INITCUSTOMIZE (TBN_FIRST-23) +#define TBN_FIRST ( -700 ) +#define TBN_GETBUTTONINFOA ( TBN_FIRST - 0 ) +#define TBN_BEGINDRAG ( TBN_FIRST - 1 ) +#define TBN_ENDDRAG ( TBN_FIRST - 2 ) +#define TBN_BEGINADJUST ( TBN_FIRST - 3 ) +#define TBN_ENDADJUST ( TBN_FIRST - 4 ) +#define TBN_RESET ( TBN_FIRST - 5 ) +#define TBN_QUERYINSERT ( TBN_FIRST - 6 ) +#define TBN_QUERYDELETE ( TBN_FIRST - 7 ) +#define TBN_TOOLBARCHANGE ( TBN_FIRST - 8 ) +#define TBN_CUSTHELP ( TBN_FIRST - 9 ) +#define TBN_DROPDOWN ( TBN_FIRST - 10 ) +#define TBN_GETOBJECT ( TBN_FIRST - 12 ) +#define TBN_HOTITEMCHANGE ( TBN_FIRST - 13 ) +#define TBN_DRAGOUT ( TBN_FIRST - 14 ) +#define TBN_DELETINGBUTTON ( TBN_FIRST - 15 ) +#define TBN_GETDISPINFOA ( TBN_FIRST - 16 ) +#define TBN_GETDISPINFOW ( TBN_FIRST - 17 ) +#define TBN_GETINFOTIPA ( TBN_FIRST - 18 ) +#define TBN_GETINFOTIPW ( TBN_FIRST - 19 ) +#define TBN_GETBUTTONINFOW ( TBN_FIRST - 20 ) +#define TBN_RESTORE ( TBN_FIRST - 21 ) +#define TBN_SAVE ( TBN_FIRST - 22 ) +#define TBN_INITCUSTOMIZE ( TBN_FIRST - 23 ) /* Toolbar Control Constants */ @@ -1494,7 +1450,7 @@ #define TBSTYLE_SEP 1 #define TBSTYLE_CHECK 2 #define TBSTYLE_GROUP 4 -#define TBSTYLE_CHECKGROUP (TBSTYLE_GROUP + TBSTYLE_CHECK) +#define TBSTYLE_CHECKGROUP ( TBSTYLE_GROUP + TBSTYLE_CHECK ) #define TBSTYLE_DROPDOWN 8 #define TBSTYLE_AUTOSIZE 16 #define TBSTYLE_NOPREFIX 32 @@ -1524,40 +1480,40 @@ #define TBSTYLE_EX_HIDECLIPPEDBUTTONS 16 // don't show partially obscured buttons #define TBSTYLE_EX_DOUBLEBUFFER 0x00000080 -#define NM_FIRST (0- 0) // generic to all controls -#define NM_LAST (0- 99) +#define NM_FIRST ( 0 - 0 ) // generic to all controls +#define NM_LAST ( 0 - 99 ) -#define NM_OUTOFMEMORY (NM_FIRST-1) -#define NM_CLICK (NM_FIRST-2) // uses NMCLICK struct -#define NM_DBLCLK (NM_FIRST-3) -#define NM_RETURN (NM_FIRST-4) -#define NM_RCLICK (NM_FIRST-5) // uses NMCLICK struct -#define NM_RDBLCLK (NM_FIRST-6) -#define NM_SETFOCUS (NM_FIRST-7) -#define NM_KILLFOCUS (NM_FIRST-8) -#define NM_CUSTOMDRAW (NM_FIRST-12) -#define NM_HOVER (NM_FIRST-13) -#define NM_NCHITTEST (NM_FIRST-14) // uses NMMOUSE struct -#define NM_KEYDOWN (NM_FIRST-15) // uses NMKEY struct -#define NM_RELEASEDCAPTURE (NM_FIRST-16) -#define NM_SETCURSOR (NM_FIRST-17) // uses NMMOUSE struct -#define NM_CHAR (NM_FIRST-18) // uses NMCHAR struct -#define NM_TOOLTIPSCREATED (NM_FIRST-19) // notify of when the tooltips window is create -#define NM_LDOWN (NM_FIRST-20) -#define NM_RDOWN (NM_FIRST-21) +#define NM_OUTOFMEMORY ( NM_FIRST - 1 ) +#define NM_CLICK ( NM_FIRST - 2 ) // uses NMCLICK struct +#define NM_DBLCLK ( NM_FIRST - 3 ) +#define NM_RETURN ( NM_FIRST - 4 ) +#define NM_RCLICK ( NM_FIRST - 5 ) // uses NMCLICK struct +#define NM_RDBLCLK ( NM_FIRST - 6 ) +#define NM_SETFOCUS ( NM_FIRST - 7 ) +#define NM_KILLFOCUS ( NM_FIRST - 8 ) +#define NM_CUSTOMDRAW ( NM_FIRST - 12 ) +#define NM_HOVER ( NM_FIRST - 13 ) +#define NM_NCHITTEST ( NM_FIRST - 14 ) // uses NMMOUSE struct +#define NM_KEYDOWN ( NM_FIRST - 15 ) // uses NMKEY struct +#define NM_RELEASEDCAPTURE ( NM_FIRST - 16 ) +#define NM_SETCURSOR ( NM_FIRST - 17 ) // uses NMMOUSE struct +#define NM_CHAR ( NM_FIRST - 18 ) // uses NMCHAR struct +#define NM_TOOLTIPSCREATED ( NM_FIRST - 19 ) // notify of when the tooltips window is create +#define NM_LDOWN ( NM_FIRST - 20 ) +#define NM_RDOWN ( NM_FIRST - 21 ) #define SBARS_SIZEGRIP 256 #define SBARS_TOOLTIPS 2048 /*-*/ -#define WM_CHOOSEFONT_GETLOGFONT (WM_USER + 1) -#define WM_CHOOSEFONT_SETLOGFONT (WM_USER + 101) -#define WM_CHOOSEFONT_SETFLAGS (WM_USER + 102) +#define WM_CHOOSEFONT_GETLOGFONT ( WM_USER + 1 ) +#define WM_CHOOSEFONT_SETLOGFONT ( WM_USER + 101 ) +#define WM_CHOOSEFONT_SETFLAGS ( WM_USER + 102 ) -/*-*/ +// // SCROLLBARS -/*-*/ +// #define SB_HORZ 0 #define SB_VERT 1 @@ -1594,12 +1550,12 @@ #define SBS_VERT 1 -#define SB_SETTEXTA (WM_USER+1) -#define SB_SETTEXTW (WM_USER+11) -#define SB_GETTEXTA (WM_USER+2) -#define SB_GETTEXTW (WM_USER+13) -#define SB_GETTEXTLENGTHA (WM_USER+3) -#define SB_GETTEXTLENGTHW (WM_USER+12) +#define SB_SETTEXTA ( WM_USER + 1 ) +#define SB_SETTEXTW ( WM_USER + 11 ) +#define SB_GETTEXTA ( WM_USER + 2 ) +#define SB_GETTEXTW ( WM_USER + 13 ) +#define SB_GETTEXTLENGTHA ( WM_USER + 3 ) +#define SB_GETTEXTLENGTHW ( WM_USER + 12 ) #define SB_GETTEXT SB_GETTEXTW #define SB_SETTEXT SB_SETTEXTW @@ -1607,19 +1563,19 @@ #define SB_SETTIPTEXT SB_SETTIPTEXTW #define SB_GETTIPTEXT SB_GETTIPTEXTW -#define SB_SETPARTS (WM_USER+4) -#define SB_GETPARTS (WM_USER+6) -#define SB_GETBORDERS (WM_USER+7) -#define SB_SETMINHEIGHT (WM_USER+8) -#define SB_SIMPLE (WM_USER+9) -#define SB_GETRECT (WM_USER+10) -#define SB_ISSIMPLE (WM_USER+14) -#define SB_SETICON (WM_USER+15) -#define SB_SETTIPTEXTA (WM_USER+16) -#define SB_SETTIPTEXTW (WM_USER+17) -#define SB_GETTIPTEXTA (WM_USER+18) -#define SB_GETTIPTEXTW (WM_USER+19) -#define SB_GETICON (WM_USER+20) +#define SB_SETPARTS ( WM_USER + 4 ) +#define SB_GETPARTS ( WM_USER + 6 ) +#define SB_GETBORDERS ( WM_USER + 7 ) +#define SB_SETMINHEIGHT ( WM_USER + 8 ) +#define SB_SIMPLE ( WM_USER + 9 ) +#define SB_GETRECT ( WM_USER + 10 ) +#define SB_ISSIMPLE ( WM_USER + 14 ) +#define SB_SETICON ( WM_USER + 15 ) +#define SB_SETTIPTEXTA ( WM_USER + 16 ) +#define SB_SETTIPTEXTW ( WM_USER + 17 ) +#define SB_GETTIPTEXTA ( WM_USER + 18 ) +#define SB_GETTIPTEXTW ( WM_USER + 19 ) +#define SB_GETICON ( WM_USER + 20 ) #define SB_SETUNICODEFORMAT CCM_SETUNICODEFORMAT #define SB_GETUNICODEFORMAT CCM_GETUNICODEFORMAT @@ -1631,7 +1587,7 @@ #define SB_SETBKCOLOR CCM_SETBKCOLOR // lParam = bkColor -#define SBN_SIMPLEMODECHANGE (SBN_FIRST - 0) +#define SBN_SIMPLEMODECHANGE ( SBN_FIRST - 0 ) #define SB_SIMPLEID 0x00ff @@ -1647,11 +1603,11 @@ #define ILC_MASK 1 #define ILC_PALETTE 2048 -/*-*/ +// // Tab Pages -/*-*/ +// -#define TCS_SCROLLOPPOSITE 0x0001 // assumes multiline tab +#define TCS_SCROLLOPPOSITE 0x0001 // assumes multiline tab #define TCS_BOTTOM 0x0002 #define TCS_RIGHT 0x0002 #define TCS_MULTISELECT 0x0004 // allow multi-select in button mode @@ -1672,9 +1628,9 @@ #define TCS_TOOLTIPS 0x4000 #define TCS_FOCUSNEVER 0x8000 -/*-*/ +// // Tree View Constants -/*-*/ +// #define WC_TREEVIEWA "SysTreeView32" #define WC_TREEVIEWW L"SysTreeView32" @@ -1718,7 +1674,7 @@ #define TVIS_STATEIMAGEMASK 61440 #define TVIS_USERMASK 61440 -#define I_CHILDRENCALLBACK (-1) +#define I_CHILDRENCALLBACK ( -1 ) #define LPTV_ITEMW LPTVITEMW #define LPTV_ITEMA LPTVITEMA @@ -1731,10 +1687,10 @@ #define TVITEM TVITEMW #define LPTVITEM LPTVITEMW -#define TVI_ROOT (-0x10000) -#define TVI_FIRST (-0x0FFFF) -#define TVI_LAST (-0x0FFFE) -#define TVI_SORT (-0x0FFFD) +#define TVI_ROOT ( -0x10000 ) +#define TVI_FIRST ( -0x0FFFF ) +#define TVI_LAST ( -0x0FFFE ) +#define TVI_SORT ( -0x0FFFD ) #define LPTV_INSERTSTRUCTA LPTVINSERTSTRUCTA #define LPTV_INSERTSTRUCTW LPTVINSERTSTRUCTW @@ -1744,11 +1700,11 @@ #define TV_INSERTSTRUCT TVINSERTSTRUCT #define LPTV_INSERTSTRUCT LPTVINSERTSTRUCT -#define TVM_INSERTITEMA (TV_FIRST + 0) -#define TVM_INSERTITEMW (TV_FIRST + 50) +#define TVM_INSERTITEMA ( TV_FIRST + 0 ) +#define TVM_INSERTITEMW ( TV_FIRST + 50 ) #define TVM_INSERTITEM TVM_INSERTITEMW -#define TVM_DELETEITEM (TV_FIRST + 1) -#define TVM_EXPAND (TV_FIRST + 2) +#define TVM_DELETEITEM ( TV_FIRST + 1 ) +#define TVM_EXPAND ( TV_FIRST + 2 ) #define TVE_COLLAPSE 1 #define TVE_EXPAND 2 @@ -1756,16 +1712,16 @@ #define TVE_EXPANDPARTIAL 16384 #define TVE_COLLAPSERESET 32768 -#define TVM_GETITEMRECT (TV_FIRST + 4) -#define TVM_GETCOUNT (TV_FIRST + 5) -#define TVM_GETINDENT (TV_FIRST + 6) -#define TVM_SETINDENT (TV_FIRST + 7) -#define TVM_GETIMAGELIST (TV_FIRST + 8) +#define TVM_GETITEMRECT ( TV_FIRST + 4 ) +#define TVM_GETCOUNT ( TV_FIRST + 5 ) +#define TVM_GETINDENT ( TV_FIRST + 6 ) +#define TVM_SETINDENT ( TV_FIRST + 7 ) +#define TVM_GETIMAGELIST ( TV_FIRST + 8 ) #define TVSIL_NORMAL 0 #define TVSIL_STATE 2 -#define TVM_SETIMAGELIST (TV_FIRST + 9) -#define TVM_GETNEXTITEM (TV_FIRST + 10) +#define TVM_SETIMAGELIST ( TV_FIRST + 9 ) +#define TVM_GETNEXTITEM ( TV_FIRST + 10 ) #define TVGN_ROOT 0 #define TVGN_NEXT 1 @@ -1779,23 +1735,23 @@ #define TVGN_CARET 9 #define TVGN_LASTVISIBLE 10 -#define TVM_SELECTITEM (TV_FIRST + 11) -#define TVM_GETITEMA (TV_FIRST + 12) -#define TVM_GETITEMW (TV_FIRST + 62) +#define TVM_SELECTITEM ( TV_FIRST + 11 ) +#define TVM_GETITEMA ( TV_FIRST + 12 ) +#define TVM_GETITEMW ( TV_FIRST + 62 ) #define TVM_GETITEM TVM_GETITEMW -#define TVM_SETITEMA (TV_FIRST + 13) -#define TVM_SETITEMW (TV_FIRST + 63) +#define TVM_SETITEMA ( TV_FIRST + 13 ) +#define TVM_SETITEMW ( TV_FIRST + 63 ) #define TVM_SETITEM TVM_SETITEMW -#define TVM_EDITLABELA (TV_FIRST + 14) -#define TVM_EDITLABELW (TV_FIRST + 65) +#define TVM_EDITLABELA ( TV_FIRST + 14 ) +#define TVM_EDITLABELW ( TV_FIRST + 65 ) #define TVM_EDITLABEL TVM_EDITLABELW -#define TVM_GETEDITCONTROL (TV_FIRST + 15) -#define TVM_GETVISIBLECOUNT (TV_FIRST + 16) -#define TVM_HITTEST (TV_FIRST + 17) +#define TVM_GETEDITCONTROL ( TV_FIRST + 15 ) +#define TVM_GETVISIBLECOUNT ( TV_FIRST + 16 ) +#define TVM_HITTEST ( TV_FIRST + 17 ) #define LPTV_HITTESTINFO LPTVHITTESTINFO #define TV_HITTESTINFO TVHITTESTINFO @@ -1803,7 +1759,7 @@ #define TVHT_NOWHERE 1 #define TVHT_ONITEMICON 2 #define TVHT_ONITEMLABEL 4 -#define TVHT_ONITEM (TVHT_ONITEMICON + TVHT_ONITEMLABEL + TVHT_ONITEMSTATEICON) +#define TVHT_ONITEM ( TVHT_ONITEMICON + TVHT_ONITEMLABEL + TVHT_ONITEMSTATEICON ) #define TVHT_ONITEMINDENT 8 #define TVHT_ONITEMBUTTON 16 #define TVHT_ONITEMRIGHT 32 @@ -1814,33 +1770,33 @@ #define TVHT_TORIGHT 1024 #define TVHT_TOLEFT 2048 -#define TVM_CREATEDRAGIMAGE (TV_FIRST + 18) -#define TVM_SORTCHILDREN (TV_FIRST + 19) -#define TVM_ENSUREVISIBLE (TV_FIRST + 20) -#define TVM_SORTCHILDRENCB (TV_FIRST + 21) -#define TVM_ENDEDITLABELNOW (TV_FIRST + 22) -#define TVM_GETISEARCHSTRINGA (TV_FIRST + 23) -#define TVM_GETISEARCHSTRINGW (TV_FIRST + 64) +#define TVM_CREATEDRAGIMAGE ( TV_FIRST + 18 ) +#define TVM_SORTCHILDREN ( TV_FIRST + 19 ) +#define TVM_ENSUREVISIBLE ( TV_FIRST + 20 ) +#define TVM_SORTCHILDRENCB ( TV_FIRST + 21 ) +#define TVM_ENDEDITLABELNOW ( TV_FIRST + 22 ) +#define TVM_GETISEARCHSTRINGA ( TV_FIRST + 23 ) +#define TVM_GETISEARCHSTRINGW ( TV_FIRST + 64 ) #define TVM_GETISEARCHSTRING TVM_GETISEARCHSTRINGW -#define TVM_SETTOOLTIPS (TV_FIRST + 24) -#define TVM_GETTOOLTIPS (TV_FIRST + 25) -#define TVM_SETINSERTMARK (TV_FIRST + 26) +#define TVM_SETTOOLTIPS ( TV_FIRST + 24 ) +#define TVM_GETTOOLTIPS ( TV_FIRST + 25 ) +#define TVM_SETINSERTMARK ( TV_FIRST + 26 ) #define TVM_SETUNICODEFORMAT CCM_SETUNICODEFORMAT #define TVM_GETUNICODEFORMAT CCM_GETUNICODEFORMAT -#define TVM_SETITEMHEIGHT (TV_FIRST + 27) -#define TVM_GETITEMHEIGHT (TV_FIRST + 28) -#define TVM_SETBKCOLOR (TV_FIRST + 29) -#define TVM_SETTEXTCOLOR (TV_FIRST + 30) -#define TVM_GETBKCOLOR (TV_FIRST + 31) -#define TVM_GETTEXTCOLOR (TV_FIRST + 32) -#define TVM_SETSCROLLTIME (TV_FIRST + 33) -#define TVM_GETSCROLLTIME (TV_FIRST + 34) -#define TVM_SETINSERTMARKCOLOR (TV_FIRST + 37) -#define TVM_GETINSERTMARKCOLOR (TV_FIRST + 38) -#define TVM_GETITEMSTATE (TV_FIRST + 39) -#define TVM_SETLINECOLOR (TV_FIRST + 40) -#define TVM_GETLINECOLOR (TV_FIRST + 41) +#define TVM_SETITEMHEIGHT ( TV_FIRST + 27 ) +#define TVM_GETITEMHEIGHT ( TV_FIRST + 28 ) +#define TVM_SETBKCOLOR ( TV_FIRST + 29 ) +#define TVM_SETTEXTCOLOR ( TV_FIRST + 30 ) +#define TVM_GETBKCOLOR ( TV_FIRST + 31 ) +#define TVM_GETTEXTCOLOR ( TV_FIRST + 32 ) +#define TVM_SETSCROLLTIME ( TV_FIRST + 33 ) +#define TVM_GETSCROLLTIME ( TV_FIRST + 34 ) +#define TVM_SETINSERTMARKCOLOR ( TV_FIRST + 37 ) +#define TVM_GETINSERTMARKCOLOR ( TV_FIRST + 38 ) +#define TVM_GETITEMSTATE ( TV_FIRST + 39 ) +#define TVM_SETLINECOLOR ( TV_FIRST + 40 ) +#define TVM_GETLINECOLOR ( TV_FIRST + 41 ) #define LPTV_SORTCB LPTVSORTCB #define TV_SORTCB TVSORTCB @@ -1855,19 +1811,19 @@ #define NMTREEVIEW NMTREEVIEWW #define LPNMTREEVIEW LPNMTREEVIEWW -#define TVN_SELCHANGINGA (TVN_FIRST-1) -#define TVN_SELCHANGINGW (TVN_FIRST-50) -#define TVN_SELCHANGEDA (TVN_FIRST-2) -#define TVN_SELCHANGEDW (TVN_FIRST-51) +#define TVN_SELCHANGINGA ( TVN_FIRST - 1 ) +#define TVN_SELCHANGINGW ( TVN_FIRST - 50 ) +#define TVN_SELCHANGEDA ( TVN_FIRST - 2 ) +#define TVN_SELCHANGEDW ( TVN_FIRST - 51 ) #define TVC_UNKNOWN 0 #define TVC_BYMOUSE 1 #define TVC_BYKEYBOARD 2 -#define TVN_GETDISPINFOA (TVN_FIRST-3) -#define TVN_GETDISPINFOW (TVN_FIRST-52) -#define TVN_SETDISPINFOA (TVN_FIRST-4) -#define TVN_SETDISPINFOW (TVN_FIRST-53) +#define TVN_GETDISPINFOA ( TVN_FIRST - 3 ) +#define TVN_GETDISPINFOW ( TVN_FIRST - 52 ) +#define TVN_SETDISPINFOA ( TVN_FIRST - 4 ) +#define TVN_SETDISPINFOW ( TVN_FIRST - 53 ) #define TVIF_DI_SETITEM 4096 @@ -1878,25 +1834,25 @@ #define NMTVDISPINFO NMTVDISPINFOW #define LPNMTVDISPINFO LPNMTVDISPINFOW -#define TVN_ITEMEXPANDINGA (TVN_FIRST-5) -#define TVN_ITEMEXPANDINGW (TVN_FIRST-54) -#define TVN_ITEMEXPANDEDA (TVN_FIRST-6) -#define TVN_ITEMEXPANDEDW (TVN_FIRST-55) -#define TVN_BEGINDRAGA (TVN_FIRST-7) -#define TVN_BEGINDRAGW (TVN_FIRST-56) -#define TVN_BEGINRDRAGA (TVN_FIRST-8) -#define TVN_BEGINRDRAGW (TVN_FIRST-57) -#define TVN_DELETEITEMA (TVN_FIRST-9) -#define TVN_DELETEITEMW (TVN_FIRST-58) -#define TVN_BEGINLABELEDITA (TVN_FIRST-10) -#define TVN_BEGINLABELEDITW (TVN_FIRST-59) -#define TVN_ENDLABELEDITA (TVN_FIRST-11) -#define TVN_ENDLABELEDITW (TVN_FIRST-60) -#define TVN_KEYDOWN (TVN_FIRST-12) +#define TVN_ITEMEXPANDINGA ( TVN_FIRST - 5 ) +#define TVN_ITEMEXPANDINGW ( TVN_FIRST - 54 ) +#define TVN_ITEMEXPANDEDA ( TVN_FIRST - 6 ) +#define TVN_ITEMEXPANDEDW ( TVN_FIRST - 55 ) +#define TVN_BEGINDRAGA ( TVN_FIRST - 7 ) +#define TVN_BEGINDRAGW ( TVN_FIRST - 56 ) +#define TVN_BEGINRDRAGA ( TVN_FIRST - 8 ) +#define TVN_BEGINRDRAGW ( TVN_FIRST - 57 ) +#define TVN_DELETEITEMA ( TVN_FIRST - 9 ) +#define TVN_DELETEITEMW ( TVN_FIRST - 58 ) +#define TVN_BEGINLABELEDITA ( TVN_FIRST - 10 ) +#define TVN_BEGINLABELEDITW ( TVN_FIRST - 59 ) +#define TVN_ENDLABELEDITA ( TVN_FIRST - 11 ) +#define TVN_ENDLABELEDITW ( TVN_FIRST - 60 ) +#define TVN_KEYDOWN ( TVN_FIRST - 12 ) -#define TVN_GETINFOTIPA (TVN_FIRST-13) -#define TVN_GETINFOTIPW (TVN_FIRST-14) -#define TVN_SINGLEEXPAND (TVN_FIRST-15) +#define TVN_GETINFOTIPA ( TVN_FIRST - 13 ) +#define TVN_GETINFOTIPW ( TVN_FIRST - 14 ) +#define TVN_SINGLEEXPAND ( TVN_FIRST - 15 ) #define TVNRET_DEFAULT 0 #define TVNRET_SKIPOLD 1 @@ -1972,51 +1928,51 @@ #define TTI_WARNING 2 #define TTI_ERROR 3 -#define TTM_ACTIVATE (WM_USER + 1) -#define TTM_SETDELAYTIME (WM_USER + 3) -#define TTM_ADDTOOLA (WM_USER + 4) -#define TTM_ADDTOOLW (WM_USER + 50) -#define TTM_DELTOOLA (WM_USER + 5) -#define TTM_DELTOOLW (WM_USER + 51) -#define TTM_NEWTOOLRECTA (WM_USER + 6) -#define TTM_NEWTOOLRECTW (WM_USER + 52) -#define TTM_RELAYEVENT (WM_USER + 7) +#define TTM_ACTIVATE ( WM_USER + 1 ) +#define TTM_SETDELAYTIME ( WM_USER + 3 ) +#define TTM_ADDTOOLA ( WM_USER + 4 ) +#define TTM_ADDTOOLW ( WM_USER + 50 ) +#define TTM_DELTOOLA ( WM_USER + 5 ) +#define TTM_DELTOOLW ( WM_USER + 51 ) +#define TTM_NEWTOOLRECTA ( WM_USER + 6 ) +#define TTM_NEWTOOLRECTW ( WM_USER + 52 ) +#define TTM_RELAYEVENT ( WM_USER + 7 ) -#define TTM_GETTOOLINFOA (WM_USER + 8) -#define TTM_GETTOOLINFOW (WM_USER + 53) +#define TTM_GETTOOLINFOA ( WM_USER + 8 ) +#define TTM_GETTOOLINFOW ( WM_USER + 53 ) -#define TTM_SETTOOLINFOA (WM_USER + 9) -#define TTM_SETTOOLINFOW (WM_USER + 54) +#define TTM_SETTOOLINFOA ( WM_USER + 9 ) +#define TTM_SETTOOLINFOW ( WM_USER + 54 ) -#define TTM_HITTESTA (WM_USER +10) -#define TTM_HITTESTW (WM_USER +55) -#define TTM_GETTEXTA (WM_USER +11) -#define TTM_GETTEXTW (WM_USER +56) -#define TTM_UPDATETIPTEXTA (WM_USER +12) -#define TTM_UPDATETIPTEXTW (WM_USER +57) -#define TTM_GETTOOLCOUNT (WM_USER +13) -#define TTM_ENUMTOOLSA (WM_USER +14) -#define TTM_ENUMTOOLSW (WM_USER +58) -#define TTM_GETCURRENTTOOLA (WM_USER + 15) -#define TTM_GETCURRENTTOOLW (WM_USER + 59) -#define TTM_WINDOWFROMPOINT (WM_USER + 16) -#define TTM_TRACKACTIVATE (WM_USER + 17) // wParam = TRUE/FALSE start end lparam = LPTOOLINFO -#define TTM_TRACKPOSITION (WM_USER + 18) // lParam = dwPos -#define TTM_SETTIPBKCOLOR (WM_USER + 19) -#define TTM_SETTIPTEXTCOLOR (WM_USER + 20) -#define TTM_GETDELAYTIME (WM_USER + 21) -#define TTM_GETTIPBKCOLOR (WM_USER + 22) -#define TTM_GETTIPTEXTCOLOR (WM_USER + 23) -#define TTM_SETMAXTIPWIDTH (WM_USER + 24) -#define TTM_GETMAXTIPWIDTH (WM_USER + 25) -#define TTM_SETMARGIN (WM_USER + 26) // lParam = lprc -#define TTM_GETMARGIN (WM_USER + 27) // lParam = lprc -#define TTM_POP (WM_USER + 28) -#define TTM_UPDATE (WM_USER + 29) -#define TTM_GETBUBBLESIZE (WM_USER + 30) -#define TTM_ADJUSTRECT (WM_USER + 31) -#define TTM_SETTITLEA (WM_USER + 32) // wParam = TTI_*, lParam = char* szTitle -#define TTM_SETTITLEW (WM_USER + 33) // wParam = TTI_*, lParam = wchar* szTitle +#define TTM_HITTESTA ( WM_USER + 10 ) +#define TTM_HITTESTW ( WM_USER + 55 ) +#define TTM_GETTEXTA ( WM_USER + 11 ) +#define TTM_GETTEXTW ( WM_USER + 56 ) +#define TTM_UPDATETIPTEXTA ( WM_USER + 12 ) +#define TTM_UPDATETIPTEXTW ( WM_USER + 57 ) +#define TTM_GETTOOLCOUNT ( WM_USER + 13 ) +#define TTM_ENUMTOOLSA ( WM_USER + 14 ) +#define TTM_ENUMTOOLSW ( WM_USER + 58 ) +#define TTM_GETCURRENTTOOLA ( WM_USER + 15 ) +#define TTM_GETCURRENTTOOLW ( WM_USER + 59 ) +#define TTM_WINDOWFROMPOINT ( WM_USER + 16 ) +#define TTM_TRACKACTIVATE ( WM_USER + 17 ) // wParam = TRUE/FALSE start end lparam = LPTOOLINFO +#define TTM_TRACKPOSITION ( WM_USER + 18 ) // lParam = dwPos +#define TTM_SETTIPBKCOLOR ( WM_USER + 19 ) +#define TTM_SETTIPTEXTCOLOR ( WM_USER + 20 ) +#define TTM_GETDELAYTIME ( WM_USER + 21 ) +#define TTM_GETTIPBKCOLOR ( WM_USER + 22 ) +#define TTM_GETTIPTEXTCOLOR ( WM_USER + 23 ) +#define TTM_SETMAXTIPWIDTH ( WM_USER + 24 ) +#define TTM_GETMAXTIPWIDTH ( WM_USER + 25 ) +#define TTM_SETMARGIN ( WM_USER + 26 ) // lParam = lprc +#define TTM_GETMARGIN ( WM_USER + 27 ) // lParam = lprc +#define TTM_POP ( WM_USER + 28 ) +#define TTM_UPDATE ( WM_USER + 29 ) +#define TTM_GETBUBBLESIZE ( WM_USER + 30 ) +#define TTM_ADJUSTRECT ( WM_USER + 31 ) +#define TTM_SETTITLEA ( WM_USER + 32 ) // wParam = TTI_*, lParam = char* szTitle +#define TTM_SETTITLEW ( WM_USER + 33 ) // wParam = TTI_*, lParam = wchar* szTitle #define TTM_ADDTOOL TTM_ADDTOOLW #define TTM_DELTOOL TTM_DELTOOLW @@ -2032,12 +1988,12 @@ /*-*/ -#define CW_USEDEFAULT (0x80000000) +#define CW_USEDEFAULT ( 0x80000000 ) -#define HWND_TOP (0) -#define HWND_BOTTOM (1) -#define HWND_TOPMOST (-1) -#define HWND_NOTOPMOST (-2) +#define HWND_TOP ( 0 ) +#define HWND_BOTTOM ( 1 ) +#define HWND_TOPMOST ( -1 ) +#define HWND_NOTOPMOST ( -2 ) #define SWP_NOSIZE 0x0001 #define SWP_NOMOVE 0x0002 @@ -2053,11 +2009,11 @@ /*-*/ -#define PBM_SETRANGE (WM_USER+1) -#define PBM_SETPOS (WM_USER+2) -#define PBM_DELTAPOS (WM_USER+3) -#define PBM_SETSTEP (WM_USER+4) -#define PBM_STEPIT (WM_USER+5) +#define PBM_SETRANGE ( WM_USER + 1 ) +#define PBM_SETPOS ( WM_USER + 2 ) +#define PBM_DELTAPOS ( WM_USER + 3 ) +#define PBM_SETSTEP ( WM_USER + 4 ) +#define PBM_STEPIT ( WM_USER + 5 ) #define PBM_SETRANGE32 1030 #define PBM_GETRANGE 1031 #define PBM_GETPOS 1032 @@ -2067,6 +2023,4 @@ #define PBS_SMOOTH 1 #define PBS_VERTICAL 4 -/*-*/ #endif -/*-*/ diff --git a/harbour/contrib/hbct/hbct.hbx b/harbour/contrib/hbct/hbct.hbx index bebd38cec3..ffcecc6884 100644 --- a/harbour/contrib/hbct/hbct.hbx +++ b/harbour/contrib/hbct/hbct.hbx @@ -3,12 +3,14 @@ */ /* -------------------------------------------------------------------- - * NOTE: You can add manual override which functions to include or - * exclude from automatically generated EXTERNAL/DYNAMIC list. + * NOTE: Following comments are control commands for the generator. + * Do not edit them unless you know what you are doing. * Syntax: // HB_FUNC_INCLUDE * // HB_FUNC_EXCLUDE */ +// HB_FUNC_EXCLUDE HB_GT_* + /* -------------------------------------------------------------------- * WARNING: Automatically generated code below. DO NOT EDIT! * Regenerate using hbmk2 '-hbx=' option. @@ -25,394 +27,393 @@ #command DYNAMIC => EXTERNAL #endif -DYNAMIC ACOS -DYNAMIC ADDASCII -DYNAMIC ADDMONTH -DYNAMIC AFTERATNUM -DYNAMIC ALLOFREE -DYNAMIC ASCIISUM -DYNAMIC ASCPOS -DYNAMIC ASIN -DYNAMIC ATADJUST -DYNAMIC ATAN -DYNAMIC ATN2 -DYNAMIC ATNUM -DYNAMIC ATREPL -DYNAMIC ATTOKEN -DYNAMIC BEFORATNUM -DYNAMIC BITTOC -DYNAMIC BLANK -DYNAMIC BOM -DYNAMIC BOQ -DYNAMIC BOY -DYNAMIC CEILING -DYNAMIC CELSIUS -DYNAMIC CENTER -DYNAMIC CHARADD -DYNAMIC CHARAND -DYNAMIC CHAREVEN -DYNAMIC CHARHIST -DYNAMIC CHARLIST -DYNAMIC CHARMIRR -DYNAMIC CHARMIX -DYNAMIC CHARNOLIST -DYNAMIC CHARNOT -DYNAMIC CHARODD -DYNAMIC CHARONE -DYNAMIC CHARONLY -DYNAMIC CHAROR -DYNAMIC CHARPACK -DYNAMIC CHARPIX -DYNAMIC CHARRELA -DYNAMIC CHARRELREP -DYNAMIC CHARREM -DYNAMIC CHARREPL -DYNAMIC CHARRLL -DYNAMIC CHARRLR -DYNAMIC CHARSHL -DYNAMIC CHARSHR -DYNAMIC CHARSLIST -DYNAMIC CHARSORT -DYNAMIC CHARSPREAD -DYNAMIC CHARSUB -DYNAMIC CHARSWAP -DYNAMIC CHARUNPACK -DYNAMIC CHARWIN -DYNAMIC CHARXOR -DYNAMIC CHECKSUM -DYNAMIC CLEARBIT -DYNAMIC CLEAREOL -DYNAMIC CLEARSLOW -DYNAMIC CLEARWIN -DYNAMIC CLEOL -DYNAMIC CLWIN -DYNAMIC COLORREPL -DYNAMIC COLORTON -DYNAMIC COLORWIN -DYNAMIC COMPLEMENT -DYNAMIC COM_BREAK -DYNAMIC COM_CLOSE -DYNAMIC COM_COUNT -DYNAMIC COM_CRC -DYNAMIC COM_CTS -DYNAMIC COM_DCD -DYNAMIC COM_DEVNAME -DYNAMIC COM_DOSCON -DYNAMIC COM_DSR -DYNAMIC COM_DTR -DYNAMIC COM_ERRCHR -DYNAMIC COM_EVENT -DYNAMIC COM_FLUSH -DYNAMIC COM_GETIO -DYNAMIC COM_GETIRQ -DYNAMIC COM_HARD -DYNAMIC COM_INIT -DYNAMIC COM_KEY -DYNAMIC COM_LSR -DYNAMIC COM_MCR -DYNAMIC COM_MSR -DYNAMIC COM_NUM -DYNAMIC COM_OPEN -DYNAMIC COM_READ -DYNAMIC COM_REMOTE -DYNAMIC COM_RING -DYNAMIC COM_RTS -DYNAMIC COM_SCOUNT -DYNAMIC COM_SEND -DYNAMIC COM_SETIO -DYNAMIC COM_SETIRQ -DYNAMIC COM_SFLUSH -DYNAMIC COM_SKEY -DYNAMIC COM_SMODE -DYNAMIC COM_SOFT -DYNAMIC COM_SOFT_R -DYNAMIC COM_SOFT_S -DYNAMIC COS -DYNAMIC COSH -DYNAMIC COT -DYNAMIC COUNTGETS -DYNAMIC COUNTLEFT -DYNAMIC COUNTRIGHT -DYNAMIC CRYPT -DYNAMIC CSETARGERR -DYNAMIC CSETATMUPA -DYNAMIC CSETCENT -DYNAMIC CSETCURS -DYNAMIC CSETKEY -DYNAMIC CSETREF -DYNAMIC CSETSAFETY -DYNAMIC CTCEXIT -DYNAMIC CTCINIT -DYNAMIC CTEXIT -DYNAMIC CTINIT -DYNAMIC CTOBIT -DYNAMIC CTODOW -DYNAMIC CTOF -DYNAMIC CTOMONTH -DYNAMIC CTON -DYNAMIC CTWINIT -DYNAMIC CTWLASTKEY -DYNAMIC CURRENTGET -DYNAMIC DAYSINMONTH -DYNAMIC DAYSTOMONTH -DYNAMIC DBFSIZE -DYNAMIC DELETEFILE -DYNAMIC DIRMAKE -DYNAMIC DIRNAME +DYNAMIC Acos +DYNAMIC AddAscii +DYNAMIC AddMonth +DYNAMIC AfterAtNum +DYNAMIC AlloFree +DYNAMIC AsciiSum +DYNAMIC AscPos +DYNAMIC Asin +DYNAMIC AtAdjust +DYNAMIC Atan +DYNAMIC Atn2 +DYNAMIC AtNum +DYNAMIC AtRepl +DYNAMIC AtToken +DYNAMIC BeforAtNum +DYNAMIC BitToC +DYNAMIC Blank +DYNAMIC BoM +DYNAMIC BoQ +DYNAMIC BoY +DYNAMIC Ceiling +DYNAMIC Celsius +DYNAMIC Center +DYNAMIC CharAdd +DYNAMIC CharAnd +DYNAMIC CharEven +DYNAMIC CharHist +DYNAMIC CharList +DYNAMIC CharMirr +DYNAMIC CharMix +DYNAMIC CharNoList +DYNAMIC CharNot +DYNAMIC CharOdd +DYNAMIC CharOne +DYNAMIC CharOnly +DYNAMIC CharOr +DYNAMIC CharPack +DYNAMIC CharPix +DYNAMIC CharRelA +DYNAMIC CharRelRep +DYNAMIC CharRem +DYNAMIC CharRepl +DYNAMIC CharRll +DYNAMIC CharRlr +DYNAMIC CharShl +DYNAMIC CharShr +DYNAMIC CharSList +DYNAMIC CharSort +DYNAMIC CharSpread +DYNAMIC CharSub +DYNAMIC CharSwap +DYNAMIC CharUnpack +DYNAMIC CharWin +DYNAMIC CharXor +DYNAMIC Checksum +DYNAMIC ClearBit +DYNAMIC ClearEol +DYNAMIC ClearSlow +DYNAMIC ClearWin +DYNAMIC ClEol +DYNAMIC ClWin +DYNAMIC ColorRepl +DYNAMIC ColorToN +DYNAMIC ColorWin +DYNAMIC Complement +DYNAMIC com_Break +DYNAMIC com_Close +DYNAMIC com_Count +DYNAMIC com_CRC +DYNAMIC com_CTS +DYNAMIC com_DCD +DYNAMIC com_DevName +DYNAMIC com_DosCon +DYNAMIC com_DSR +DYNAMIC com_DTR +DYNAMIC com_ErrChr +DYNAMIC com_Event +DYNAMIC com_Flush +DYNAMIC com_GetIO +DYNAMIC com_GetIRQ +DYNAMIC com_Hard +DYNAMIC com_Init +DYNAMIC com_Key +DYNAMIC com_LSR +DYNAMIC com_MCR +DYNAMIC com_MSR +DYNAMIC com_Num +DYNAMIC com_Open +DYNAMIC com_Read +DYNAMIC com_Remote +DYNAMIC com_Ring +DYNAMIC com_RTS +DYNAMIC com_SCount +DYNAMIC com_Send +DYNAMIC com_SetIO +DYNAMIC com_SetIRQ +DYNAMIC com_SFlush +DYNAMIC com_SKey +DYNAMIC com_SMode +DYNAMIC com_Soft +DYNAMIC com_Soft_R +DYNAMIC com_Soft_S +DYNAMIC Cos +DYNAMIC Cosh +DYNAMIC Cot +DYNAMIC CountGets +DYNAMIC CountLeft +DYNAMIC CountRight +DYNAMIC Crypt +DYNAMIC CSetArgErr +DYNAMIC CSetAtMupa +DYNAMIC CSetCent +DYNAMIC CSetCurs +DYNAMIC CSetKey +DYNAMIC CSetRef +DYNAMIC CSetSafety +DYNAMIC CTCExit +DYNAMIC CTCInit +DYNAMIC CTExit +DYNAMIC CTInit +DYNAMIC CToBit +DYNAMIC CToDoW +DYNAMIC CToF +DYNAMIC CToMonth +DYNAMIC CToN +DYNAMIC CTWInit +DYNAMIC CTWLastKey +DYNAMIC CurrentGet +DYNAMIC DaysInMonth +DYNAMIC DaysToMonth +DYNAMIC DbfSize +DYNAMIC DeleteFile +DYNAMIC DirMake +DYNAMIC DirName DYNAMIC DMY -DYNAMIC DOSPARAM -DYNAMIC DOY -DYNAMIC DRIVETYPE -DYNAMIC DSETKBIOS -DYNAMIC DTOR -DYNAMIC ENHANCED -DYNAMIC ENVPARAM -DYNAMIC EOM -DYNAMIC EOQ -DYNAMIC EOY -DYNAMIC EXENAME -DYNAMIC EXPAND -DYNAMIC EXPONENT -DYNAMIC FACT -DYNAMIC FAHRENHEIT -DYNAMIC FIELDDECI -DYNAMIC FIELDNUM -DYNAMIC FIELDSIZE -DYNAMIC FILEAPPEND -DYNAMIC FILEATTR -DYNAMIC FILECCLOSE -DYNAMIC FILECCONT -DYNAMIC FILECDATI -DYNAMIC FILECOPEN -DYNAMIC FILECOPY -DYNAMIC FILEDATE -DYNAMIC FILEDELETE -DYNAMIC FILEMOVE -DYNAMIC FILESCREEN -DYNAMIC FILESEEK -DYNAMIC FILESIZE -DYNAMIC FILESMAX -DYNAMIC FILESTR -DYNAMIC FILETIME -DYNAMIC FLOOR -DYNAMIC FTOC +DYNAMIC DosParam +DYNAMIC DoY +DYNAMIC DriveType +DYNAMIC DSetKBIOS +DYNAMIC DToR +DYNAMIC Enhanced +DYNAMIC EnvParam +DYNAMIC EoM +DYNAMIC EoQ +DYNAMIC EoY +DYNAMIC ExeName +DYNAMIC Expand +DYNAMIC Exponent +DYNAMIC Fact +DYNAMIC Fahrenheit +DYNAMIC FieldDeci +DYNAMIC FieldNum +DYNAMIC FieldSize +DYNAMIC FileAppend +DYNAMIC FileAttr +DYNAMIC FileCCLose +DYNAMIC FileCCont +DYNAMIC FileCDaTi +DYNAMIC FileCOpen +DYNAMIC FileCopy +DYNAMIC FileDate +DYNAMIC FileDelete +DYNAMIC FileMove +DYNAMIC FileScreen +DYNAMIC FileSeek +DYNAMIC FileSize +DYNAMIC FileSMax +DYNAMIC FileStr +DYNAMIC FileTime +DYNAMIC Floor +DYNAMIC FToC DYNAMIC FV -DYNAMIC GETCLEARA -DYNAMIC GETCLEARB -DYNAMIC GETFLDCOL -DYNAMIC GETFLDROW -DYNAMIC GETFLDVAR -DYNAMIC GETINPUT -DYNAMIC GETKXLAT -DYNAMIC GETKXTAB -DYNAMIC GETPREC -DYNAMIC GETSECRET -DYNAMIC HBCT_GETKXLAT -DYNAMIC HBCT_GETKXTAB -DYNAMIC HBCT_MAXCOL -DYNAMIC HBCT_MAXROW -DYNAMIC HBCT_SETKXLAT -DYNAMIC HBCT_SETKXTAB -DYNAMIC HB_GT_CTW -DYNAMIC INFINITY -DYNAMIC INTNEG -DYNAMIC INTPOS -DYNAMIC INVERTATTR -DYNAMIC INVERTWIN -DYNAMIC ISAT -DYNAMIC ISBIT -DYNAMIC ISLEAP -DYNAMIC JUSTLEFT -DYNAMIC JUSTRIGHT -DYNAMIC KBDSTAT -DYNAMIC KEYSEC -DYNAMIC KEYTIME -DYNAMIC KSETCAPS -DYNAMIC KSETINS -DYNAMIC KSETNUM -DYNAMIC KSETSCROLL -DYNAMIC LASTDAYOM -DYNAMIC LIKE -DYNAMIC LOG10 -DYNAMIC LTOC -DYNAMIC LTON -DYNAMIC MANTISSA -DYNAMIC MAXLINE +DYNAMIC GetClearA +DYNAMIC GetClearB +DYNAMIC GetFldCol +DYNAMIC GetFldRow +DYNAMIC GetFldVar +DYNAMIC GetInput +DYNAMIC GetKXLat +DYNAMIC GetKXTab +DYNAMIC GetPrec +DYNAMIC GetSecret +DYNAMIC hbct_GetKXLat +DYNAMIC hbct_GetKXTab +DYNAMIC hbct_MaxCol +DYNAMIC hbct_MaxRow +DYNAMIC hbct_SetKXLat +DYNAMIC hbct_SetKXTab +DYNAMIC Infinity +DYNAMIC IntNeg +DYNAMIC IntPos +DYNAMIC InvertAttr +DYNAMIC InvertWin +DYNAMIC IsAt +DYNAMIC IsBit +DYNAMIC IsLeap +DYNAMIC JustLeft +DYNAMIC JustRight +DYNAMIC KbdStat +DYNAMIC KeySec +DYNAMIC KeyTime +DYNAMIC KSetCaps +DYNAMIC KSetIns +DYNAMIC KSetNum +DYNAMIC KSetScroll +DYNAMIC LastDayOM +DYNAMIC Like +DYNAMIC Log10 +DYNAMIC LToC +DYNAMIC LToN +DYNAMIC Mantissa +DYNAMIC MaxLine DYNAMIC MDY -DYNAMIC MILLISEC -DYNAMIC NETCANCEL -DYNAMIC NETDISK -DYNAMIC NETPRINTER -DYNAMIC NETREDIR -DYNAMIC NETRMTNAME -DYNAMIC NETWORK -DYNAMIC NNETWORK -DYNAMIC NTOC -DYNAMIC NTOCDOW -DYNAMIC NTOCMONTH -DYNAMIC NTOCOLOR -DYNAMIC NUL -DYNAMIC NUMAND -DYNAMIC NUMAT -DYNAMIC NUMCOUNT -DYNAMIC NUMDISKL -DYNAMIC NUMHIGH -DYNAMIC NUMLINE -DYNAMIC NUMLOW -DYNAMIC NUMMIRR -DYNAMIC NUMNOT -DYNAMIC NUMOR -DYNAMIC NUMROL -DYNAMIC NUMTOKEN -DYNAMIC NUMXOR -DYNAMIC PADLEFT -DYNAMIC PADRIGHT -DYNAMIC PAYMENT -DYNAMIC PERIODS +DYNAMIC Millisec +DYNAMIC NetCancel +DYNAMIC NetDisk +DYNAMIC NetPrinter +DYNAMIC NetRedir +DYNAMIC NetRmtname +DYNAMIC Network +DYNAMIC NNetwork +DYNAMIC NToC +DYNAMIC NToCDoW +DYNAMIC NToCMonth +DYNAMIC NToColor +DYNAMIC Nul +DYNAMIC NumAnd +DYNAMIC NumAt +DYNAMIC NumCount +DYNAMIC NumDiskL +DYNAMIC NumHigh +DYNAMIC NumLine +DYNAMIC NumLow +DYNAMIC NumMirr +DYNAMIC NumNot +DYNAMIC NumOr +DYNAMIC NumRol +DYNAMIC NumToken +DYNAMIC NumXor +DYNAMIC PadLeft +DYNAMIC PadRight +DYNAMIC Payment +DYNAMIC Periods DYNAMIC PI -DYNAMIC POSALPHA -DYNAMIC POSCHAR -DYNAMIC POSDEL -DYNAMIC POSDIFF -DYNAMIC POSEQUAL -DYNAMIC POSINS -DYNAMIC POSLOWER -DYNAMIC POSRANGE -DYNAMIC POSREPL -DYNAMIC POSUPPER -DYNAMIC PRINTREADY -DYNAMIC PRINTSEND -DYNAMIC PRINTSTAT +DYNAMIC PosAlpha +DYNAMIC PosChar +DYNAMIC PosDel +DYNAMIC PosDiff +DYNAMIC PosEqual +DYNAMIC PosIns +DYNAMIC PosLower +DYNAMIC PosRange +DYNAMIC PosRepl +DYNAMIC PosUpper +DYNAMIC PrintReady +DYNAMIC PrintSend +DYNAMIC PrintStat DYNAMIC PV -DYNAMIC QUARTER -DYNAMIC RAND -DYNAMIC RANDOM -DYNAMIC RANGEREM -DYNAMIC RANGEREPL -DYNAMIC RATE -DYNAMIC REMALL -DYNAMIC REMLEFT -DYNAMIC REMRIGHT -DYNAMIC RENAMEFILE -DYNAMIC REPLALL -DYNAMIC REPLLEFT -DYNAMIC REPLRIGHT -DYNAMIC RESTCURSOR -DYNAMIC RESTGETS -DYNAMIC RESTSETKEY -DYNAMIC RESTTOKEN -DYNAMIC RTOD -DYNAMIC SAVECURSOR -DYNAMIC SAVEGETS -DYNAMIC SAVESETKEY -DYNAMIC SAVETOKEN -DYNAMIC SAYDOWN -DYNAMIC SAYMOVEIN -DYNAMIC SAYSCREEN -DYNAMIC SAYSPREAD -DYNAMIC SCREENATTR -DYNAMIC SCREENFILE -DYNAMIC SCREENMARK -DYNAMIC SCREENMIX -DYNAMIC SCREENSTR -DYNAMIC SCREENTEXT -DYNAMIC SECTOTIME -DYNAMIC SETATLIKE -DYNAMIC SETBIT -DYNAMIC SETCLEARA -DYNAMIC SETCLEARB -DYNAMIC SETDATE -DYNAMIC SETFATTR -DYNAMIC SETFCREATE -DYNAMIC SETFDATI -DYNAMIC SETFONT -DYNAMIC SETKXLAT -DYNAMIC SETKXTAB -DYNAMIC SETLASTKEY -DYNAMIC SETPREC -DYNAMIC SETRC -DYNAMIC SETTIME -DYNAMIC SHOWTIME -DYNAMIC SIGN -DYNAMIC SIN -DYNAMIC SINH -DYNAMIC STANDARD -DYNAMIC STRDIFF -DYNAMIC STRFILE -DYNAMIC STRSCREEN -DYNAMIC STRSWAP -DYNAMIC TABEXPAND -DYNAMIC TABPACK -DYNAMIC TAN -DYNAMIC TANH -DYNAMIC TEMPFILE -DYNAMIC TIMETOSEC -DYNAMIC TIMEVALID -DYNAMIC TOKEN -DYNAMIC TOKENAT -DYNAMIC TOKENEND -DYNAMIC TOKENEXIT -DYNAMIC TOKENINIT -DYNAMIC TOKENLOWER -DYNAMIC TOKENNEXT -DYNAMIC TOKENNUM -DYNAMIC TOKENSEP -DYNAMIC TOKENUPPER -DYNAMIC TOOLVER -DYNAMIC TRUENAME -DYNAMIC UNSELECTED -DYNAMIC UNTEXTWIN -DYNAMIC VALPOS -DYNAMIC VGAPALETTE -DYNAMIC VIDEOTYPE -DYNAMIC VOLSERIAL -DYNAMIC VOLUME -DYNAMIC WACLOSE -DYNAMIC WAITPERIOD -DYNAMIC WALIAS -DYNAMIC WBOARD -DYNAMIC WBOX -DYNAMIC WCENTER -DYNAMIC WCLOSE -DYNAMIC WCOL -DYNAMIC WEEK -DYNAMIC WFCOL -DYNAMIC WFLASTCOL -DYNAMIC WFLASTROW -DYNAMIC WFORMAT -DYNAMIC WFROW -DYNAMIC WHIDE -DYNAMIC WLASTCOL -DYNAMIC WLASTROW -DYNAMIC WLEVEL -DYNAMIC WLIST -DYNAMIC WMODE -DYNAMIC WMOVE -DYNAMIC WNUM -DYNAMIC WOM -DYNAMIC WOPEN -DYNAMIC WORDONE -DYNAMIC WORDONLY -DYNAMIC WORDREM -DYNAMIC WORDREPL -DYNAMIC WORDSWAP -DYNAMIC WORDTOCHAR -DYNAMIC WROW -DYNAMIC WSELECT -DYNAMIC WSETMOVE -DYNAMIC WSETSHADOW -DYNAMIC WSHADOW -DYNAMIC WSHOW -DYNAMIC WSTEP -DYNAMIC XMOBLOCK -DYNAMIC XMOCHECK -DYNAMIC XTOC -DYNAMIC ZEROINSERT -DYNAMIC ZEROREMOVE -DYNAMIC _WSTACK -DYNAMIC __HBCT_DSPTIME -DYNAMIC __HBCT_KEY_C_TO_N -DYNAMIC __HBCT_KEY_N_TO_C +DYNAMIC Quarter +DYNAMIC Rand +DYNAMIC Random +DYNAMIC RangeRem +DYNAMIC RangeRepl +DYNAMIC Rate +DYNAMIC RemAll +DYNAMIC RemLeft +DYNAMIC RemRight +DYNAMIC RenameFile +DYNAMIC ReplAll +DYNAMIC ReplLeft +DYNAMIC ReplRight +DYNAMIC RestCursor +DYNAMIC RestGets +DYNAMIC RestSetKEY +DYNAMIC RestToken +DYNAMIC RToD +DYNAMIC SaveCursor +DYNAMIC SaveGets +DYNAMIC SaveSetKey +DYNAMIC SaveToken +DYNAMIC SayDown +DYNAMIC SayMoveIn +DYNAMIC SayScreen +DYNAMIC SaySpread +DYNAMIC ScreenAttr +DYNAMIC ScreenFile +DYNAMIC ScreenMark +DYNAMIC ScreenMix +DYNAMIC ScreenStr +DYNAMIC ScreenText +DYNAMIC SecToTime +DYNAMIC SetAtLike +DYNAMIC SetBit +DYNAMIC SetClearA +DYNAMIC SetClearB +DYNAMIC SetDate +DYNAMIC SetFattr +DYNAMIC SetFCreate +DYNAMIC SetFDaTi +DYNAMIC SetFont +DYNAMIC SetKXLat +DYNAMIC SetKXTab +DYNAMIC SetLastKey +DYNAMIC SetPREC +DYNAMIC SetRC +DYNAMIC SetTime +DYNAMIC ShowTime +DYNAMIC Sign +DYNAMIC Sin +DYNAMIC Sinh +DYNAMIC Standard +DYNAMIC StrDiff +DYNAMIC StrFile +DYNAMIC StrScreen +DYNAMIC StrSwap +DYNAMIC TabExpand +DYNAMIC TabPack +DYNAMIC Tan +DYNAMIC Tanh +DYNAMIC TempFile +DYNAMIC TimeToSec +DYNAMIC TimeValid +DYNAMIC Token +DYNAMIC TokenAt +DYNAMIC TokenEnd +DYNAMIC TokenExit +DYNAMIC TokenInit +DYNAMIC TokenLower +DYNAMIC TokenNext +DYNAMIC TokenNum +DYNAMIC TokenSep +DYNAMIC TokenUpper +DYNAMIC ToolVer +DYNAMIC TrueName +DYNAMIC Unselected +DYNAMIC UnTextWin +DYNAMIC ValPos +DYNAMIC VGAPalette +DYNAMIC VideoType +DYNAMIC VolSerial +DYNAMIC Volume +DYNAMIC WAClose +DYNAMIC WaitPeriod +DYNAMIC WAlias +DYNAMIC WBoard +DYNAMIC WBox +DYNAMIC WCenter +DYNAMIC WClose +DYNAMIC WCol +DYNAMIC Week +DYNAMIC WFCol +DYNAMIC WFLastCol +DYNAMIC WFLastRow +DYNAMIC WFormat +DYNAMIC WFRow +DYNAMIC WHide +DYNAMIC WLastCol +DYNAMIC WLastRow +DYNAMIC WLevel +DYNAMIC WList +DYNAMIC WMode +DYNAMIC WMove +DYNAMIC WNum +DYNAMIC WoM +DYNAMIC WOpen +DYNAMIC WordOne +DYNAMIC WordOnly +DYNAMIC WordRem +DYNAMIC WordRepl +DYNAMIC WordSwap +DYNAMIC WordToChar +DYNAMIC WRow +DYNAMIC WSelect +DYNAMIC WSetMove +DYNAMIC WSetShadow +DYNAMIC WShadow +DYNAMIC WShow +DYNAMIC WStep +DYNAMIC XMoBlock +DYNAMIC XMoCheck +DYNAMIC XToC +DYNAMIC ZeroInsert +DYNAMIC ZeroRemove +DYNAMIC _WStack +DYNAMIC __hbct_DSPTime +DYNAMIC __hbct_key_c_to_n +DYNAMIC __hbct_key_n_to_c #if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBCT__REQUEST ) #uncommand DYNAMIC => EXTERNAL