diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-02-19 11:45:08 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-02-19 11:45:08 (GMT) |
| commit | dce78bcb0455e180116b61b634496b64c6e5254d (patch) | |
| tree | 473ac79a684d30769f6e2178a7d7039974497cdf /win | |
| parent | 5ae0e88cc49f83ebe127f1aebddadc4e5d7c1990 (diff) | |
| download | tk-dce78bcb0455e180116b61b634496b64c6e5254d.zip tk-dce78bcb0455e180116b61b634496b64c6e5254d.tar.gz tk-dce78bcb0455e180116b61b634496b64c6e5254d.tar.bz2 | |
Use Tcl_ObjCmdProc(2?) in stead of full signature, where possible
Diffstat (limited to 'win')
| -rw-r--r-- | win/tkWinGDI.c | 25 | ||||
| -rw-r--r-- | win/tkWinMenu.c | 4 | ||||
| -rw-r--r-- | win/tkWinSend.c | 2 | ||||
| -rw-r--r-- | win/tkWinTest.c | 22 |
4 files changed, 15 insertions, 38 deletions
diff --git a/win/tkWinGDI.c b/win/tkWinGDI.c index b47b1de..317c7af 100644 --- a/win/tkWinGDI.c +++ b/win/tkWinGDI.c @@ -85,24 +85,13 @@ static void GetDisplaySize(LONG *width, LONG *height); static int GdiWordToWeight(const char *str); static int GdiParseFontWords(Tcl_Interp *interp, LOGFONTW *lf, const char *str[], int numargs); -static int PrintSelectPrinter(void *clientData, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); -static int PrintOpenPrinter(void *clientData, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); -static int PrintClosePrinter(void *clientData, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); -static int PrintOpenDoc(void *clientData, Tcl_Interp *interp, - int objc, Tcl_Obj *const objv[]); -static int PrintCloseDoc(void *clientData, Tcl_Interp *interp, - int objc, Tcl_Obj *const objv[]); -static int PrintOpenPage(void *clientData, Tcl_Interp *interp, - int objc, Tcl_Obj *const objv[]); -static int PrintClosePage(void *clientData, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); +static Tcl_ObjCmdProc PrintSelectPrinter; +static Tcl_ObjCmdProc PrintOpenPrinter; +static Tcl_ObjCmdProc PrintClosePrinter; +static Tcl_ObjCmdProc PrintOpenDoc; +static Tcl_ObjCmdProc PrintCloseDoc; +static Tcl_ObjCmdProc PrintOpenPage; +static Tcl_ObjCmdProc PrintClosePage; /* * Global state. diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c index 755033d..c102e14 100644 --- a/win/tkWinMenu.c +++ b/win/tkWinMenu.c @@ -176,9 +176,7 @@ static void GetTearoffEntryGeometry(TkMenu *menuPtr, const Tk_FontMetrics *fmPtr, int *widthPtr, int *heightPtr); static int GetNewID(TkMenuEntry *mePtr, WORD *menuIDPtr); -static int TkWinMenuKeyObjCmd(void *clientData, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); +static Tcl_ObjCmdProc TkWinMenuKeyObjCmd; static void MenuSelectEvent(TkMenu *menuPtr); static void ReconfigureWindowsMenu(void *clientData); static void RecursivelyClearActiveMenu(TkMenu *menuPtr); diff --git a/win/tkWinSend.c b/win/tkWinSend.c index 6989a24..082cf16 100644 --- a/win/tkWinSend.c +++ b/win/tkWinSend.c @@ -63,7 +63,7 @@ static Tcl_ThreadDataKey dataKey; */ #ifdef TK_SEND_ENABLED_ON_WINDOWS -static void CmdDeleteProc(void *clientData); +static CmdDeleteProc CmdDeleteProc; static void RevokeObjectRegistration(RegisteredInterp *riPtr); #endif /* TK_SEND_ENABLED_ON_WINDOWS */ static HRESULT BuildMoniker(const char *name, LPMONIKER *pmk); diff --git a/win/tkWinTest.c b/win/tkWinTest.c index 64a1ae8..8f186be 100644 --- a/win/tkWinTest.c +++ b/win/tkWinTest.c @@ -24,22 +24,12 @@ HWND tkWinCurrentDialog; * Forward declarations of functions defined later in this file: */ -static int TestclipboardObjCmd(void *clientData, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); -static int TestwineventObjCmd(void *clientData, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); -static int TestfindwindowObjCmd(void *clientData, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); -static int TestgetwindowinfoObjCmd(void *clientData, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); -static int TestwinlocaleObjCmd(void *clientData, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); -static Tk_GetSelProc SetSelectionResult; +static Tcl_ObjCmdProc TestclipboardObjCmd; +static Tcl_ObjCmdProc TestwineventObjCmd; +static Tcl_ObjCmdProc TestfindwindowObjCmd; +static Tcl_ObjCmdProc TestgetwindowinfoObjCmd; +static Tcl_ObjCmdProc TestwinlocaleObjCmd; +static Tk_GetSelProc SetSelectionResult; /* *---------------------------------------------------------------------- |