From: <mie...@us...> - 2007-09-24 17:12:51
|
Revision: 801 http://oorexx.svn.sourceforge.net/oorexx/?rev=801&view=rev Author: miesfeld Date: 2007-09-24 10:12:29 -0700 (Mon, 24 Sep 2007) Log Message: ----------- ooDialog - Back out revsion 800, which committed more than I intended. Sorry, don't know why I keep doing this. Modified Paths: -------------- interpreter-3.x/trunk/platform/windows/oodialog/advctrl.cls interpreter-3.x/trunk/platform/windows/oodialog/oodutils.cls interpreter-3.x/trunk/platform/windows/oodialog/oovdraw.c interpreter-3.x/trunk/platform/windows/oodialog/oovmsg.c interpreter-3.x/trunk/platform/windows/oodialog/oovother.c interpreter-3.x/trunk/platform/windows/oodialog/oovtext.c interpreter-3.x/trunk/platform/windows/oodialog/oovuser.c interpreter-3.x/trunk/platform/windows/oodialog/oovutil.c interpreter-3.x/trunk/platform/windows/oodialog/oovutil.def interpreter-3.x/trunk/platform/windows/oodialog/oovutil.h interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls Modified: interpreter-3.x/trunk/platform/windows/oodialog/advctrl.cls =================================================================== --- interpreter-3.x/trunk/platform/windows/oodialog/advctrl.cls 2007-09-24 17:07:31 UTC (rev 800) +++ interpreter-3.x/trunk/platform/windows/oodialog/advctrl.cls 2007-09-24 17:12:29 UTC (rev 801) @@ -697,21 +697,6 @@ ::method LastItem attribute -/* DFX TODO implement storing lastitem index in the window words!! -::method new class - use arg pdialog, id, category - Forward Class(Super) continue /* this also calls Init */ - obj = result - - data = HandleListCtrlEx(obj~hWnd, "M", "USER", "G") - say "Got back" data "for USERDATA" - data = HandleListCtrlEx(obj~hWnd, "M", "USER", "S", 99) - say "Set 99, got back again:" data - data = HandleListCtrlEx(obj~hWnd, "M", "USER", "G") - say "Now got back" data "for USERDATA" - return obj -*/ - ::method Init forward class (super) continue self~LastItem = -1 Modified: interpreter-3.x/trunk/platform/windows/oodialog/oodutils.cls =================================================================== --- interpreter-3.x/trunk/platform/windows/oodialog/oodutils.cls 2007-09-24 17:07:31 UTC (rev 800) +++ interpreter-3.x/trunk/platform/windows/oodialog/oodutils.cls 2007-09-24 17:12:29 UTC (rev 801) @@ -154,7 +154,6 @@ installed = 1 end ret = SleepMS(ms) - if installed = 1 then call RxfuncDrop "SleepMS" return ret ::routine ScreenSize public Modified: interpreter-3.x/trunk/platform/windows/oodialog/oovdraw.c =================================================================== --- interpreter-3.x/trunk/platform/windows/oodialog/oovdraw.c 2007-09-24 17:07:31 UTC (rev 800) +++ interpreter-3.x/trunk/platform/windows/oodialog/oovdraw.c 2007-09-24 17:12:29 UTC (rev 801) @@ -328,8 +328,6 @@ } else if (argc == 2) /* color brush */ hB = CreateSolidBrush(PALETTEINDEX(atoi(argv[1].strptr))); - // hB = GetSysColorBrush(COLOR_BTNFACE); DFX TODO add createSystemBrush - // to ooDialog. else hB = (HBRUSH)GetStockObject(HOLLOW_BRUSH); RETVAL((ULONG)hB) @@ -580,8 +578,6 @@ dlgAdm->ColorTab[dlgAdm->CT_size].ColorBk = atoi(argv[3].strptr); if (argc == 5) dlgAdm->ColorTab[i].ColorFG = atoi(argv[4].strptr); else dlgAdm->ColorTab[i].ColorFG = -1; dlgAdm->ColorTab[dlgAdm->CT_size].ColorBrush = (HBRUSH)CreateSolidBrush(PALETTEINDEX(dlgAdm->ColorTab[dlgAdm->CT_size].ColorBk)); - //dlgAdm->ColorTab[dlgAdm->CT_size].ColorBrush = (HBRUSH)GetSysColorBrush(dlgAdm->ColorTab[dlgAdm->CT_size].ColorBk); - // DFX TODO add method for setting colore to system color. dlgAdm->CT_size++; } } Modified: interpreter-3.x/trunk/platform/windows/oodialog/oovmsg.c =================================================================== --- interpreter-3.x/trunk/platform/windows/oodialog/oovmsg.c 2007-09-24 17:07:31 UTC (rev 800) +++ interpreter-3.x/trunk/platform/windows/oodialog/oovmsg.c 2007-09-24 17:12:29 UTC (rev 801) @@ -52,7 +52,6 @@ extern CRITICAL_SECTION crit_sec; /* defined in OOVUTIL.C */ extern BOOL DialogInAdminTable(DIALOGADMIN * Dlg); -extern BOOL AddDialogMessage(CHAR *, CHAR *); BOOL AddDialogMessage(CHAR * msg, CHAR * Qptr) @@ -131,9 +130,6 @@ && ( ((message == WM_NOTIFY) && ((ULONG)(((NMHDR *)lparam)->code & m[i].filterL) == m[i].lParam)) || ((message != WM_NOTIFY) && ( (ULONG)(lparam & m[i].filterL) == m[i].lParam)) ) ) { - //if ( message == WM_COMMAND ) printf("WM_COMMAND: wparam: %u lparam: %u lparam low: 0x%08x hi: 0x%08x\n", - // param, lparam, (int)(short)LOWORD(lparam), (int)(short)HIWORD(lparam)); - if (param || lparam) /* if one of the params is <> 0, build argument string */ { char msgstr[512]; Modified: interpreter-3.x/trunk/platform/windows/oodialog/oovother.c =================================================================== --- interpreter-3.x/trunk/platform/windows/oodialog/oovother.c 2007-09-24 17:07:31 UTC (rev 800) +++ interpreter-3.x/trunk/platform/windows/oodialog/oovother.c 2007-09-24 17:12:29 UTC (rev 801) @@ -55,10 +55,7 @@ WORD NumDIBColorEntries(LPBITMAPINFO lpBmpInfo); extern LPBITMAPINFO LoadDIB(LPSTR szFile); extern LONG EvaluateListStyle(CHAR * styledesc); -extern BOOL AddDialogMessage(CHAR *, CHAR *); -extern HHOOK hHook = NULL; - /* Local functions */ static LONG SetStyle(HWND, LONG); @@ -958,87 +955,7 @@ return 0; } -/* - * Initialize lfHeight to 10 times the desired point size. Pass a HDC to use - * to convert to logical units, or NULL to use a screen DC. -*/ -HFONT CreatePointFontIndirect(const LOGFONT *pLF, HDC hDC) -{ - LOGFONT lf = *pLF; - POINT pt, ptOrg = {0,0}; - BOOL bScreenDC = (hDC == NULL); - - if (bScreenDC) - hDC = GetDC(NULL); /* Get screen DC */ - - pt.y = MulDiv(lf.lfHeight, GetDeviceCaps(hDC, LOGPIXELSY), 720); - DPtoLP(hDC, &pt, 1); - DPtoLP(hDC, &ptOrg, 1); - lf.lfHeight = -abs(pt.y - ptOrg.y); - - if (bScreenDC) - ReleaseDC(NULL, hDC); - - return CreateFontIndirect(&lf); -} - -LRESULT CALLBACK EditSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, - LPARAM lParam, UINT_PTR id, DWORD_PTR dwData) -{ - SUBCLASSDATA * pData = (SUBCLASSDATA *)dwData; - - switch ( msg ) - { - case WM_GETDLGCODE: - // Don't do anything for now. - break; - - case WM_KEYDOWN: - { - CHAR oodMsg[256]; - LRESULT ret = DefSubclassProc(hwnd, msg, wParam, lParam); - - //printf("Key down id: %u dwData: %p method: %s q: %p keyCode: %d\n", - // id, pData, pData->pNotifyMethod, pData->pMessageQueue, wParam); - - sprintf(oodMsg, "%s(%u,%u)", pData->pNotifyMethod, wParam, lParam); - AddDialogMessage((char *)oodMsg, pData->pMessageQueue); - return ret; - } - - case WM_NCDESTROY: - if ( pData ) - { - LocalFree(pData->pNotifyMethod); - LocalFree(pData); - } - RemoveWindowSubclass(hwnd, EditSubclassProc, id); - break; - - } - return DefSubclassProc(hwnd, msg, wParam, lParam); -} - -LRESULT CALLBACK KeyboardHookProc(int code, WPARAM wParam, LPARAM lParam) -{ - if (code == HC_ACTION) - printf("KeyboardProc() code: %d wParam: %d lParam: 0x%08x thread %u\n", code, wParam, lParam, GetCurrentThreadId()); - return CallNextHookEx(hHook, code, wParam, lParam); -} - /** - * Determine if a window belongs to the specified window class. - */ -static BOOL checkWindowClass(HWND hwnd, TCHAR *pClass) -{ - TCHAR buf[64]; - - if ( ! RealGetWindowClass(hwnd, buf, sizeof(buf)) || strcmp(buf, pClass) ) - return FALSE; - return TRUE; -} - -/** * Extended Common Control functionality. This function implements capabilities * for the common controls that were not available at the time of the original * IBM ooDialog, or were available but not put into ooDialog. @@ -1099,10 +1016,6 @@ */ if ( argv[2].strptr[0] == 'E' ) /* Edit control function */ { - /* Ensure this is an edit control */ - if ( ! checkWindowClass(hCtrl, WC_EDIT) ) - RETVAL(-1) - if ( !strcmp(argv[3].strptr, "MSG") ) /* Send an edit message (EM_*) */ { CHECKARGL(5); @@ -1220,80 +1133,6 @@ } else RETERR } - else if ( argv[2].strptr[0] == 'B' ) /* Button control function */ - { - /* Ensure this is a Button control */ - if ( ! checkWindowClass(hCtrl, WC_BUTTON) ) - RETVAL(-1) - - if ( !strcmp(argv[3].strptr, "DEF") ) /* Change the default push button */ - { - LRESULT result; - HWND hOldDef = 0; - - /* Determine if a button is currently the default. */ - result = SendMessage(hDlg, DM_GETDEFID, 0, 0); - if ( HIWORD(result) == DC_HASDEFID ) - { - /* If the new default button is the same as existing, just return. */ - if ( LOWORD(result) == id ) - RETC(0) - hOldDef = (HWND)GetDlgItem(hDlg, LOWORD(result)); - } - - /* These SendMessage() functions always return the same value, so - * zero is always returned to ooRexx. Changing the default push - * button does not remove the default appearance from the old - * default button. For the old default button, the style needs to - * be explicitly changed. - */ - SendMessage(hDlg, DM_SETDEFID, (WPARAM)id, 0); - if ( hOldDef ) - SendMessage(hOldDef, BM_SETSTYLE, (WPARAM)BS_PUSHBUTTON, (LPARAM)TRUE); - - RETC(0) - } - else if ( !strcmp(argv[3].strptr, "TYPE") ) /* Button Type */ - { - LONG type; - PCHAR p; - - type = GetWindowLong(hCtrl, GWL_STYLE) & BS_TYPEMASK; - - switch ( type ) - { - case BS_PUSHBUTTON : p = "PushButton"; - break; - case BS_PUSHBOX : p = "PushBox"; - break; - case BS_DEFPUSHBUTTON : p = "DefPushButton"; - break; - case BS_CHECKBOX : p = "CheckBox"; - break; - case BS_AUTOCHECKBOX : p = "AutoCheckBox"; - break; - case BS_3STATE : p = "3State"; - break; - case BS_AUTO3STATE : p = "Auto3State"; - break; - case BS_RADIOBUTTON : p = "RadioButton"; - break; - case BS_AUTORADIOBUTTON : p = "AutoRadioButton"; - break; - case BS_GROUPBOX : p = "GroupBox"; - break; - case BS_USERBUTTON : - case BS_OWNERDRAW : p = "OwnerDrawn"; - break; - default : p = "Unknown"; - break; - } - strcpy(retstr->strptr, p); - retstr->strlength = strlen(retstr->strptr); - return 0; - } - else RETERR - } else if ( argv[2].strptr[0] == 'X' ) /* eXtended work with the window style */ { LONG lStyle = GetWindowLong(hCtrl, GWL_STYLE); @@ -1373,123 +1212,7 @@ } else RETERR } - else if ( argv[2].strptr[0] == 'S' ) /* Subclass control */ - { - SUBCLASSDATA * pData; - DIALOGADMIN * dlgAdm = (DIALOGADMIN *)atol(argv[3].strptr); - if ( ! dlgAdm ) RETVAL(-3) - if ( argc < 5 ) RETVAL(-3) - - pData = LocalAlloc(LPTR, sizeof(SUBCLASSDATA)); - if ( ! pData ) RETVAL(-4) - - pData->pNotifyMethod = LocalAlloc(LMEM_FIXED, argv[4].strlength + 1); - if ( ! pData->pNotifyMethod ) RETVAL(-4) - - rxstrlcpy(pData->pNotifyMethod, argv[4]); - pData->hCtrl = hCtrl; - pData->uID = id; - pData->pMessageQueue = dlgAdm->pMessageQueue; - printf("HandleControlEx Subclass thread ID: %u\n", GetCurrentThreadId()); - RETVAL(! SendMessage(hDlg, WM_USER_SUBCLASS, (WPARAM)&EditSubclassProc, (LPARAM)pData)) - } - else if ( argv[2].strptr[0] == 'H' ) /* install Hook */ - { - /* - SUBCLASSDATA * pData; - DIALOGADMIN * dlgAdm = (DIALOGADMIN *)atol(argv[3].strptr); - - if ( ! dlgAdm ) RETVAL(-3) - if ( argc < 5 ) RETVAL(-3) - - pData = LocalAlloc(LPTR, sizeof(SUBCLASSDATA)); - if ( ! pData ) RETVAL(-4) - - pData->pNotifyMethod = LocalAlloc(LMEM_FIXED, argv[4].strlength + 1); - if ( ! pData->pNotifyMethod ) RETVAL(-4) - - rxstrlcpy(pData->pNotifyMethod, argv[4]); - pData->hCtrl = hCtrl; - pData->uID = id; - pData->pMessageQueue = dlgAdm->pMessageQueue; - */ - - printf("HandleControlEx Hook thread ID: %u\n", GetCurrentThreadId()); - RETVAL(! SendMessage(hDlg, WM_USER_HOOK, (WPARAM)&KeyboardHookProc, (LPARAM)0)) - } - else if ( argv[2].strptr[0] == 'F' ) /* Font */ - { - LOGFONT lf; - long lRet = 0; - HFONT hFont; - int ptSize; - //HDC hdc = GetWindowDC(hCtrl); - HDC hdc = GetDC(NULL); - static int ctr = 0; - - CHECKARG(5) - - if ( ctr == 0 ) - { - ctr++; - SetLastError(0); - } - ptSize = atol(argv[4].strptr); - strcpy(lf.lfFaceName, argv[3].strptr); - - //hFont = CreatePointFontIndirect(&lf, hdc); - - lf.lfHeight = -MulDiv(ptSize, GetDeviceCaps(hdc, LOGPIXELSY), 72); - ReleaseDC(NULL, hdc); - lf.lfHeight = abs(lf.lfHeight); - hFont = CreateFontIndirect(&lf); - - //lRet = SendMessage(hCtrl, WM_SETFONT, (WPARAM)hFont, (LPARAM)TRUE); - lRet = SendMessage(hCtrl, WM_SETFONT, (WPARAM)hFont, (LPARAM)TRUE); - printf("Font size: %d name: %s hFont: %u ret: %d last: %u\n", - lf.lfHeight, lf.lfFaceName, hFont, lRet, GetLastError()); - - ultoa((ULONG)hFont, retstr->strptr, 10); - retstr->strlength = strlen(retstr->strptr); - return 0; - } - else if ( argv[2].strptr[0] == 'M' ) /* MapDialogRect */ - { - RECT pixel; - RECT dtu; - double factorX, factorX2, factorY, factorY2; - - CHECKARG(7) - - pixel.left = atol(argv[3].strptr); - pixel.top = atol(argv[4].strptr); - pixel.right = atol(argv[5].strptr); - pixel.bottom = atol(argv[6].strptr); - - dtu.left = pixel.left; - dtu.top = pixel.top; - dtu.right = pixel.right; - dtu.bottom = pixel.bottom; - - if ( MapDialogRect(hDlg, &pixel) ) - { - factorX = (float)pixel.left / (float)dtu.left; - factorY = (float)pixel.top / (float)dtu.top; - factorX2 = (float)pixel.right / (float)dtu.right; - factorY2 = (float)pixel.bottom / (float)dtu.bottom; - - sprintf(retstr->strptr, "%d %d %d %d %5.3f %5.3f lower right %5.3f %5.3f", - pixel.left, pixel.top, pixel.right, pixel.bottom, factorX, factorY, factorX2, factorY2); - retstr->strlength = strlen(retstr->strptr); - return 0; - } - else - { - RETVAL(GetLastError()) - } - } - RETERR } @@ -1792,12 +1515,11 @@ { ULONG flag; LONG startItem; - INT i; CHECKARG(5); startItem = atol(argv[3].strptr); - printf("List control get next start: %d arg4: %s\n", startItem, argv[4].strptr); + if (!strcmp(argv[4].strptr, "FIRSTVISIBLE")) RETVAL(ListView_GetTopIndex(h)) @@ -1813,12 +1535,7 @@ else if (strstr(argv[4].strptr,"FOCUSED")) flag |= LVNI_FOCUSED; else if (strstr(argv[4].strptr,"SELECTED")) flag |= LVNI_SELECTED; - //flag = LVNI_ALL; - i = ListView_GetNextItem(h, startItem, flag); - printf("Got back: %d\n", i); - - RETVAL(i) - //RETVAL(ListView_GetNextItem(h, startItem, flag)) + RETVAL(ListView_GetNextItem(h, startItem, flag)) } else if (!strcmp(argv[1].strptr, "SETIMG")) Modified: interpreter-3.x/trunk/platform/windows/oodialog/oovtext.c =================================================================== --- interpreter-3.x/trunk/platform/windows/oodialog/oovtext.c 2007-09-24 17:07:31 UTC (rev 800) +++ interpreter-3.x/trunk/platform/windows/oodialog/oovtext.c 2007-09-24 17:12:29 UTC (rev 801) @@ -201,19 +201,15 @@ (BOOL)strstr(opts, "STRIKEOUT"), DEFAULT_CHARSET, OUT_TT_PRECIS, CLIP_DEFAULT_PRECIS, DRAFT_QUALITY, FF_DONTCARE, argv[3].strptr); oldF = SelectObject(hDC, hFont); - if (dlgAdm) - //if (dlgAdm && dlgAdm->Use3DControls) + if (dlgAdm && dlgAdm->Use3DControls) { - printf("Using COLOR_BTNFACE pen\n"); hpen = CreatePen(PS_SOLID, 1, GetSysColor(COLOR_BTNFACE)); hbr = CreateSolidBrush(GetSysColor(COLOR_BTNFACE)); SetBkColor(hDC, GetSysColor(COLOR_BTNFACE)); oP = SelectObject(hDC, hpen); oB = SelectObject(hDC, hbr); - } else { - printf("Using WHITE_PEN pen\n"); + } else oP = SelectObject(hDC, GetStockObject(WHITE_PEN)); - } if (col > 0) SetTextColor(hDC, PALETTEINDEX(col)); sl = strlen(text); @@ -309,8 +305,7 @@ SelectObject(hDC, oldF); SelectObject(hDC, oP); - if (dlgAdm) - //if (dlgAdm->Use3DControls) + if (dlgAdm->Use3DControls) { SelectObject(hDC, oB); DeleteObject(hpen); Modified: interpreter-3.x/trunk/platform/windows/oodialog/oovuser.c =================================================================== --- interpreter-3.x/trunk/platform/windows/oodialog/oovuser.c 2007-09-24 17:07:31 UTC (rev 800) +++ interpreter-3.x/trunk/platform/windows/oodialog/oovuser.c 2007-09-24 17:12:29 UTC (rev 801) @@ -197,46 +197,6 @@ } -ULONG APIENTRY GetSysMetrics( - PUCHAR funcname, - ULONG argc, - RXSTRING argv[], - PUCHAR qname, - PRXSTRING retstr ) -{ - ULONG uVal; - - if ( argc == 1 ) - { - uVal = GetSystemMetrics(atoi(argv[0].strptr)); - - sprintf(retstr->strptr, "%d", uVal); - retstr->strlength = strlen(retstr->strptr); - } - else - { - PSZ token; - PSZ str; - - if ( argv[0].strlength == 0 ) RETVAL(-3) - - str = _strdup(argv[0].strptr); - printf("Starting string: %s\n", str); - - token = strtok(str, " "); - while( token != NULL ) - { - printf(" %s\n", token); - token = strtok(NULL, " "); - } - free(str); - RETVAL(0); - } - - return 0; -} - - void UCreateDlg(WORD ** ppTemplate, WORD **p, INT NrItems, INT x, INT y, INT cx, INT cy, CHAR * dlgClass, CHAR * title, CHAR * fontname, INT fontsize, ULONG lStyle) { Modified: interpreter-3.x/trunk/platform/windows/oodialog/oovutil.c =================================================================== --- interpreter-3.x/trunk/platform/windows/oodialog/oovutil.c 2007-09-24 17:07:31 UTC (rev 800) +++ interpreter-3.x/trunk/platform/windows/oodialog/oovutil.c 2007-09-24 17:12:29 UTC (rev 801) @@ -35,10 +35,6 @@ /* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /* */ /*----------------------------------------------------------------------------*/ -#define NTDDI_VERSION NTDDI_WINXPSP2 -#define _WIN32_WINNT 0x0501 -#define WINVER 0x0501 - #include <windows.h> #include <mmsystem.h> #include <shlwapi.h> @@ -67,8 +63,6 @@ extern WPARAM InterruptScroll; extern DWORD ComCtl32Version = 0; -extern HHOOK hHook; - extern BOOL SearchMessageTable(ULONG message, WPARAM param, LPARAM lparam, DIALOGADMIN * addressedTo); extern BOOL DrawBitmapButton(DIALOGADMIN * addr, HWND hDlg, WPARAM wParam, LPARAM lParam, BOOL MsgEnabled); extern BOOL DrawBackgroundBmp(DIALOGADMIN * addr, HWND hDlg, WPARAM wParam, LPARAM lParam); @@ -236,29 +230,6 @@ case WM_USER_GETKEYSTATE: ReplyMessage((LRESULT)GetAsyncKeyState(wParam)); return (TRUE); - - case WM_USER_SUBCLASS: - { - SUBCLASSDATA * pData = (SUBCLASSDATA *)lParam; - SUBCLASSPROC pfnSubclass = (SUBCLASSPROC) wParam; - BOOL success; - - printf("WM_USER_SUBCLASS thread ID: %u\n", GetCurrentThreadId()); - if ( pData ) - { - success = SetWindowSubclass(pData->hCtrl, pfnSubclass, pData->uID, (DWORD_PTR)pData); - ReplyMessage((LRESULT)success); - } - } return (TRUE); - - case WM_USER_HOOK: - { - HOOKPROC pfnHook = (HOOKPROC) wParam; - - printf("WM_USER_HOOK thread ID: %u\n", GetCurrentThreadId()); - hHook = SetWindowsHookEx(WH_KEYBOARD, pfnHook, NULL, GetCurrentThreadId()); - ReplyMessage((LRESULT)(BOOL)hHook); - } return (TRUE); } } } @@ -1314,7 +1285,7 @@ "HandleScrollBar" \ }; -#define SFTS 20 +#define SFTS 19 CHAR * SpecialFuncTab[SFTS] = {\ "BmpButton", \ "DCDraw", \ @@ -1331,7 +1302,6 @@ "HandleListCtrlEx", \ "HandleControlEx", \ "HandleOtherNewCtrls", \ - "GetSysMetrics", \ "DialogMenu", \ "WinTimer", \ "HandleFont", \ @@ -1443,7 +1413,7 @@ INITCOMMONCONTROLSEX ctrlex; ctrlex.dwSize = sizeof(ctrlex); - ctrlex.dwICC = ICC_WIN95_CLASSES | ICC_STANDARD_CLASSES; + ctrlex.dwICC = ICC_WIN95_CLASSES; if ( ! InitCommonControlsEx(&ctrlex) ) { CHAR msg[128]; Modified: interpreter-3.x/trunk/platform/windows/oodialog/oovutil.def =================================================================== --- interpreter-3.x/trunk/platform/windows/oodialog/oovutil.def 2007-09-24 17:07:31 UTC (rev 800) +++ interpreter-3.x/trunk/platform/windows/oodialog/oovutil.def 2007-09-24 17:12:29 UTC (rev 801) @@ -95,7 +95,6 @@ GETSCREENSIZE = GetScreenSize GETDIALOGFACTOR = GetDialogFactor GETSTDTEXTSIZE = GetStdTextSize - GETSYSMETRICS = GetSysMetrics INSTMMFUNCS = InstMMFuncs REMOVEMMFUNCS = RemoveMMFuncs Modified: interpreter-3.x/trunk/platform/windows/oodialog/oovutil.h =================================================================== --- interpreter-3.x/trunk/platform/windows/oodialog/oovutil.h 2007-09-24 17:07:31 UTC (rev 800) +++ interpreter-3.x/trunk/platform/windows/oodialog/oovutil.h 2007-09-24 17:12:29 UTC (rev 801) @@ -61,24 +61,7 @@ #define WM_USER_GETFOCUS WM_USER + 0x0603 #define WM_USER_GETSETCAPTURE WM_USER + 0x0604 #define WM_USER_GETKEYSTATE WM_USER + 0x0605 -#define WM_USER_SUBCLASS WM_USER + 0x0606 -#define WM_USER_HOOK WM_USER + 0x0607 - -typedef struct { - ULONG msg; - ULONG filterM; - ULONG wParam; - ULONG filterP; - ULONG lParam; - ULONG filterL; - ULONG tag; - HWND hCtrl; - UINT uID; - PCHAR pMessageQueue; - PCHAR pNotifyMethod; -} SUBCLASSDATA; - #define VISDLL "OODIALOG.DLL" #define DLLVER 2130 Modified: interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls =================================================================== --- interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls 2007-09-24 17:07:31 UTC (rev 800) +++ interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls 2007-09-24 17:12:29 UTC (rev 801) @@ -352,16 +352,10 @@ ::method Run unguarded protected use arg sleeptime if Arg(1,'o') = 1 then sleeptime = 0 - - m = self~start("Bogus") - drop m - do while self~finished = 0 self~HandleMessages(sleeptime) end -::method Bogus - /* this method will create the dialog, show it (see method show), start */ /* automatic methods and destroy the dialog. Data will be set and */ /* received */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |