diff options
| -rw-r--r-- | generic/tkBusy.c | 22 | ||||
| -rw-r--r-- | generic/tkCmds.c | 81 | ||||
| -rw-r--r-- | generic/tkInt.h | 6 | ||||
| -rw-r--r-- | generic/tkUtil.c | 13 | ||||
| -rw-r--r-- | macosx/tkMacOSXDialog.c | 40 | ||||
| -rw-r--r-- | win/tkWinDialog.c | 62 | ||||
| -rw-r--r-- | win/tkWinSend.c | 21 | ||||
| -rw-r--r-- | win/tkWinTest.c | 29 | ||||
| -rw-r--r-- | win/tkWinX.c | 22 | ||||
| -rw-r--r-- | win/ttkWinTheme.c | 206 | ||||
| -rw-r--r-- | win/ttkWinXPTheme.c | 47 |
11 files changed, 283 insertions, 266 deletions
diff --git a/generic/tkBusy.c b/generic/tkBusy.c index f6ae494..2c56bf6 100644 --- a/generic/tkBusy.c +++ b/generic/tkBusy.c @@ -32,11 +32,11 @@ static const Tk_OptionSpec busyOptionSpecs[] = { * Forward declarations of functions defined in this file. */ -static void BusyEventProc(ClientData clientData, +static void BusyEventProc(void *clientData, XEvent *eventPtr); -static void BusyGeometryProc(ClientData clientData, +static void BusyGeometryProc(void *clientData, Tk_Window tkwin); -static void BusyCustodyProc(ClientData clientData, +static void BusyCustodyProc(void *clientData, Tk_Window tkwin); static int ConfigureBusy(Tcl_Interp *interp, Busy *busyPtr, int objc, Tcl_Obj *const objv[]); @@ -53,10 +53,10 @@ static int HoldBusy(Tcl_HashTable *busyTablePtr, static void MakeTransparentWindowExist(Tk_Window tkwin, Window parent); static inline Tk_Window NextChild(Tk_Window tkwin); -static void RefWinEventProc(ClientData clientData, +static void RefWinEventProc(void *clientData, XEvent *eventPtr); static inline void SetWindowInstanceData(Tk_Window tkwin, - ClientData instanceData); + void *instanceData); /* * The "busy" geometry manager definition. @@ -96,7 +96,7 @@ NextChild( static inline void SetWindowInstanceData( Tk_Window tkwin, - ClientData instanceData) + void *instanceData) { struct TkWindow *winPtr = (struct TkWindow *) tkwin; @@ -124,7 +124,7 @@ SetWindowInstanceData( static void BusyCustodyProc( - ClientData clientData, /* Information about the busy window. */ + void *clientData, /* Information about the busy window. */ TCL_UNUSED(Tk_Window)) /* Not used. */ { Busy *busyPtr = (Busy *)clientData; @@ -246,7 +246,7 @@ DoConfigureNotify( static void RefWinEventProc( - ClientData clientData, /* Busy window record */ + void *clientData, /* Busy window record */ XEvent *eventPtr) /* Event which triggered call to routine */ { Busy *busyPtr = (Busy *)clientData; @@ -372,7 +372,7 @@ DestroyBusy( static void BusyEventProc( - ClientData clientData, /* Busy window record */ + void *clientData, /* Busy window record */ XEvent *eventPtr) /* Event which triggered call to routine */ { Busy *busyPtr = (Busy *)clientData; @@ -785,9 +785,9 @@ HoldBusy( int Tk_BusyObjCmd( - ClientData clientData, /* Main window associated with interpreter. */ + void *clientData, /* Main window associated with interpreter. */ Tcl_Interp *interp, /* Current interpreter. */ - int objc, /* Number of arguments. */ + Tcl_Size objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ { Tk_Window tkwin = (Tk_Window)clientData; diff --git a/generic/tkCmds.c b/generic/tkCmds.c index b781405..448a207 100644 --- a/generic/tkCmds.c +++ b/generic/tkCmds.c @@ -27,26 +27,26 @@ */ static TkWindow * GetTopHierarchy(Tk_Window tkwin); -static char * WaitVariableProc(ClientData clientData, +static char * WaitVariableProc(void *clientData, Tcl_Interp *interp, const char *name1, const char *name2, int flags); -static void WaitVisibilityProc(ClientData clientData, +static void WaitVisibilityProc(void *clientData, XEvent *eventPtr); -static void WaitWindowProc(ClientData clientData, +static void WaitWindowProc(void *clientData, XEvent *eventPtr); -static int AppnameCmd(ClientData dummy, Tcl_Interp *interp, - int objc, Tcl_Obj *const *objv); -static int CaretCmd(ClientData dummy, Tcl_Interp *interp, - int objc, Tcl_Obj *const *objv); -static int InactiveCmd(ClientData dummy, Tcl_Interp *interp, - int objc, Tcl_Obj *const *objv); -static int ScalingCmd(ClientData dummy, Tcl_Interp *interp, - int objc, Tcl_Obj *const *objv); -static int UseinputmethodsCmd(ClientData dummy, - Tcl_Interp *interp, int objc, +static int AppnameCmd(void *dummy, Tcl_Interp *interp, + Tcl_Size objc, Tcl_Obj *const *objv); +static int CaretCmd(void *dummy, Tcl_Interp *interp, + Tcl_Size objc, Tcl_Obj *const *objv); +static int InactiveCmd(void *dummy, Tcl_Interp *interp, + Tcl_Size objc, Tcl_Obj *const *objv); +static int ScalingCmd(void *dummy, Tcl_Interp *interp, + Tcl_Size objc, Tcl_Obj *const *objv); +static int UseinputmethodsCmd(void *dummy, + Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *const *objv); -static int WindowingsystemCmd(ClientData dummy, - Tcl_Interp *interp, int objc, +static int WindowingsystemCmd(void *dummy, + Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *const *objv); #if defined(_WIN32) || defined(MAC_OSX_TK) @@ -90,7 +90,7 @@ static const TkEnsemble tkCmdMap[] = { int Tk_BellObjCmd( - ClientData clientData, /* Main window associated with interpreter. */ + void *clientData, /* Main window associated with interpreter. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ @@ -158,14 +158,14 @@ Tk_BellObjCmd( int Tk_BindObjCmd( - ClientData clientData, /* Main window associated with interpreter. */ + void *clientData, /* Main window associated with interpreter. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ { Tk_Window tkwin = (Tk_Window)clientData; TkWindow *winPtr; - ClientData object; + void *object; const char *string; if ((objc < 2) || (objc > 4)) { @@ -342,7 +342,7 @@ TkBindEventProc( int Tk_BindtagsObjCmd( - ClientData clientData, /* Main window associated with interpreter. */ + void *clientData, /* Main window associated with interpreter. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ @@ -482,7 +482,7 @@ TkFreeBindingTags( int Tk_DestroyObjCmd( - ClientData clientData, /* Main window associated with interpreter. */ + void *clientData, /* Main window associated with interpreter. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ @@ -529,7 +529,7 @@ Tk_DestroyObjCmd( int Tk_LowerObjCmd( - ClientData clientData, /* Main window associated with interpreter. */ + void *clientData, /* Main window associated with interpreter. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ @@ -588,7 +588,7 @@ Tk_LowerObjCmd( int Tk_RaiseObjCmd( - ClientData clientData, /* Main window associated with interpreter. */ + void *clientData, /* Main window associated with interpreter. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ @@ -647,7 +647,7 @@ Tk_RaiseObjCmd( int TkInitTkCmd( Tcl_Interp *interp, - ClientData clientData) + void *clientData) { /* If the interp is safe, leave out "fontchooser" */ int isSafe = Tcl_IsSafe(interp); @@ -680,9 +680,9 @@ TkInitTkCmd( int AppnameCmd( - ClientData clientData, /* Main window associated with interpreter. */ + void *clientData, /* Main window associated with interpreter. */ Tcl_Interp *interp, /* Current interpreter. */ - int objc, /* Number of arguments. */ + Tcl_Size objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ { Tk_Window tkwin = (Tk_Window)clientData; @@ -712,9 +712,9 @@ AppnameCmd( int CaretCmd( - ClientData clientData, /* Main window associated with interpreter. */ + void *clientData, /* Main window associated with interpreter. */ Tcl_Interp *interp, /* Current interpreter. */ - int objc, /* Number of arguments. */ + Tcl_Size objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ { Tk_Window tkwin = (Tk_Window)clientData; @@ -778,7 +778,8 @@ CaretCmd( } Tcl_SetObjResult(interp, Tcl_NewWideIntObj(value)); } else { - int i, value, x = 0, y = 0, height = -1; + Tcl_Size i; + int value, x = 0, y = 0, height = -1; for (i = 2; i < objc; i += 2) { if ((Tcl_GetIndexFromObj(interp, objv[i], caretStrings, @@ -804,9 +805,9 @@ CaretCmd( int ScalingCmd( - ClientData clientData, /* Main window associated with interpreter. */ + void *clientData, /* Main window associated with interpreter. */ Tcl_Interp *interp, /* Current interpreter. */ - int objc, /* Number of arguments. */ + Tcl_Size objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ { Tk_Window tkwin = (Tk_Window)clientData; @@ -855,9 +856,9 @@ ScalingCmd( int UseinputmethodsCmd( - ClientData clientData, /* Main window associated with interpreter. */ + void *clientData, /* Main window associated with interpreter. */ Tcl_Interp *interp, /* Current interpreter. */ - int objc, /* Number of arguments. */ + Tcl_Size objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ { Tk_Window tkwin = (Tk_Window)clientData; @@ -903,7 +904,7 @@ int WindowingsystemCmd( TCL_UNUSED(void *), /* Main window associated with interpreter. */ Tcl_Interp *interp, /* Current interpreter. */ - int objc, /* Number of arguments. */ + Tcl_Size objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ { const char *windowingsystem; @@ -925,9 +926,9 @@ WindowingsystemCmd( int InactiveCmd( - ClientData clientData, /* Main window associated with interpreter. */ + void *clientData, /* Main window associated with interpreter. */ Tcl_Interp *interp, /* Current interpreter. */ - int objc, /* Number of arguments. */ + Tcl_Size objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ { Tk_Window tkwin = (Tk_Window)clientData; @@ -988,7 +989,7 @@ InactiveCmd( int Tk_TkwaitObjCmd( - ClientData clientData, /* Main window associated with interpreter. */ + void *clientData, /* Main window associated with interpreter. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ @@ -1116,7 +1117,7 @@ Tk_TkwaitObjCmd( static char * WaitVariableProc( - ClientData clientData, /* Pointer to integer to set to 1. */ + void *clientData, /* Pointer to integer to set to 1. */ Tcl_Interp *interp, /* Interpreter containing variable. */ const char *name1, /* Name of variable. */ TCL_UNUSED(const char *), /* Second part of variable name. */ @@ -1132,7 +1133,7 @@ WaitVariableProc( static void WaitVisibilityProc( - ClientData clientData, /* Pointer to integer to set to 1. */ + void *clientData, /* Pointer to integer to set to 1. */ XEvent *eventPtr) /* Information about event (not used). */ { int *donePtr = (int *)clientData; @@ -1146,7 +1147,7 @@ WaitVisibilityProc( static void WaitWindowProc( - ClientData clientData, /* Pointer to integer to set to 1. */ + void *clientData, /* Pointer to integer to set to 1. */ XEvent *eventPtr) /* Information about event. */ { int *donePtr = (int *)clientData; @@ -1273,7 +1274,7 @@ Tk_UpdateObjCmd( int Tk_WinfoObjCmd( - ClientData clientData, /* Main window associated with interpreter. */ + void *clientData, /* Main window associated with interpreter. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ diff --git a/generic/tkInt.h b/generic/tkInt.h index 052ed4e..a4a1abf 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -992,7 +992,11 @@ typedef struct { typedef struct TkEnsemble { const char *name; +#if TCL_MAJOR_VERSION > 8 + Tcl_ObjCmdProc2 *proc; +#else Tcl_ObjCmdProc *proc; +#endif const struct TkEnsemble *subensemble; } TkEnsemble; @@ -1200,7 +1204,7 @@ MODULE_SCOPE int Tk_BindtagsObjCmd(void *clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); MODULE_SCOPE int Tk_BusyObjCmd(void *clientData, - Tcl_Interp *interp, int objc, + Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *const objv[]); MODULE_SCOPE int Tk_ButtonObjCmd(void *clientData, Tcl_Interp *interp, int objc, diff --git a/generic/tkUtil.c b/generic/tkUtil.c index 9871f10..5bcbe2c 100644 --- a/generic/tkUtil.c +++ b/generic/tkUtil.c @@ -46,7 +46,7 @@ const Tcl_ObjType tkStateKeyObjType = { int TkStateParseProc( - ClientData clientData, /* some flags.*/ + void *clientData, /* some flags.*/ Tcl_Interp *interp, /* Used for reporting errors. */ TCL_UNUSED(Tk_Window), /* Window containing canvas widget. */ const char *value, /* Value of option. */ @@ -257,7 +257,7 @@ TkOrientPrintProc( int TkOffsetParseProc( - ClientData clientData, /* not used */ + void *clientData, /* not used */ Tcl_Interp *interp, /* Interpreter to send results back to */ Tk_Window tkwin, /* Window on same display as tile */ const char *value, /* Name of image */ @@ -473,7 +473,7 @@ TkOffsetPrintProc( int TkPixelParseProc( - ClientData clientData, /* If non-NULL, negative values are allowed as + void *clientData, /* If non-NULL, negative values are allowed as * well. */ Tcl_Interp *interp, /* Interpreter to send results back to */ Tk_Window tkwin, /* Window on same display as tile */ @@ -1100,7 +1100,7 @@ TkMakeEnsemble( Tcl_Interp *interp, const char *namesp, const char *name, - ClientData clientData, + void *clientData, const TkEnsemble map[]) { Tcl_Namespace *namespacePtr = NULL; @@ -1151,8 +1151,13 @@ TkMakeEnsemble( Tcl_AppendStringsToObj(fqdnObj, "::", map[i].name, NULL); Tcl_DictObjPut(NULL, dictObj, nameObj, fqdnObj); if (map[i].proc) { +#if TCL_MAJOR_VERSION > 8 + Tcl_CreateObjCommand2(interp, Tcl_GetString(fqdnObj), + map[i].proc, clientData, NULL); +#else Tcl_CreateObjCommand(interp, Tcl_GetString(fqdnObj), map[i].proc, clientData, NULL); +#endif } else if (map[i].subensemble) { TkMakeEnsemble(interp, Tcl_DStringValue(&ds), map[i].name, clientData, map[i].subensemble); diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c index a646478..2ae6dc5 100644 --- a/macosx/tkMacOSXDialog.c +++ b/macosx/tkMacOSXDialog.c @@ -427,7 +427,7 @@ static NSInteger showOpenSavePanel( int Tk_ChooseColorObjCmd( - ClientData clientData, /* Main window associated with interpreter. */ + void *clientData, /* Main window associated with interpreter. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ @@ -683,7 +683,7 @@ filterCompatible( int Tk_GetOpenFileObjCmd( - ClientData clientData, /* Main window associated with interpreter. */ + void *clientData, /* Main window associated with interpreter. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ @@ -954,7 +954,7 @@ Tk_GetOpenFileObjCmd( int Tk_GetSaveFileObjCmd( - ClientData clientData, /* Main window associated with interpreter. */ + void *clientData, /* Main window associated with interpreter. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ @@ -1196,7 +1196,7 @@ Tk_GetSaveFileObjCmd( int Tk_ChooseDirectoryObjCmd( - ClientData clientData, /* Main window associated with interpreter. */ + void *clientData, /* Main window associated with interpreter. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ @@ -1376,7 +1376,7 @@ TkMacOSXStandardAboutPanelObjCmd( int Tk_MessageBoxObjCmd( - ClientData clientData, /* Main window associated with interpreter. */ + void *clientData, /* Main window associated with interpreter. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ @@ -1581,18 +1581,18 @@ enum FontchooserEvent { static void FontchooserEvent(int kind); static Tcl_Obj * FontchooserCget(FontchooserData *fcdPtr, int optionIndex); -static int FontchooserConfigureCmd(ClientData clientData, - Tcl_Interp *interp, int objc, +static int FontchooserConfigureCmd(void *clientData, + Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *const objv[]); -static int FontchooserShowCmd(ClientData clientData, - Tcl_Interp *interp, int objc, +static int FontchooserShowCmd(void *clientData, + Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *const objv[]); -static int FontchooserHideCmd(ClientData clientData, - Tcl_Interp *interp, int objc, +static int FontchooserHideCmd(void *clientData, + Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *const objv[]); -static void FontchooserParentEventHandler(ClientData clientData, +static void FontchooserParentEventHandler(void *clientData, XEvent *eventPtr); -static void DeleteFontchooserData(ClientData clientData, +static void DeleteFontchooserData(void *clientData, Tcl_Interp *interp); MODULE_SCOPE const TkEnsemble tkFontchooserEnsemble[]; @@ -1810,9 +1810,9 @@ FontchooserCget( static int FontchooserConfigureCmd( - ClientData clientData, /* Main window */ + void *clientData, /* Main window */ Tcl_Interp *interp, - int objc, + Tcl_Size objc, Tcl_Obj *const objv[]) { Tk_Window tkwin = (Tk_Window)clientData; @@ -1975,9 +1975,9 @@ FontchooserConfigureCmd( static int FontchooserShowCmd( - ClientData clientData, /* Main window */ + void *clientData, /* Main window */ Tcl_Interp *interp, - TCL_UNUSED(int), + TCL_UNUSED(Tcl_Size), TCL_UNUSED(Tcl_Obj *const *)) { FontchooserData *fcdPtr = (FontchooserData *)Tcl_GetAssocData(interp, "::tk::fontchooser", @@ -2025,7 +2025,7 @@ static int FontchooserHideCmd( TCL_UNUSED(void *), /* Main window */ TCL_UNUSED(Tcl_Interp *), - TCL_UNUSED(int), + TCL_UNUSED(Tcl_Size), TCL_UNUSED(Tcl_Obj *const *)) { NSFontPanel *fp = [[NSFontManager sharedFontManager] fontPanel:NO]; @@ -2055,7 +2055,7 @@ FontchooserHideCmd( static void FontchooserParentEventHandler( - ClientData clientData, + void *clientData, XEvent *eventPtr) { FontchooserData *fcdPtr = (FontchooserData *)clientData; @@ -2087,7 +2087,7 @@ FontchooserParentEventHandler( static void DeleteFontchooserData( - ClientData clientData, + void *clientData, Tcl_Interp *interp) { FontchooserData *fcdPtr = (FontchooserData *)clientData; diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c index e769daf..72766f9 100644 --- a/win/tkWinDialog.c +++ b/win/tkWinDialog.c @@ -568,14 +568,14 @@ static UINT APIENTRY ChooseDirectoryValidateProc(HWND hdlg, UINT uMsg, static UINT CALLBACK ColorDlgHookProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); static void CleanupOFNOptions(OFNOpts *optsPtr); -static int ParseOFNOptions(ClientData clientData, +static int ParseOFNOptions(void *clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], enum OFNOper oper, OFNOpts *optsPtr); static int GetFileNameXP(Tcl_Interp *interp, OFNOpts *optsPtr, enum OFNOper oper); static int GetFileNameVista(Tcl_Interp *interp, OFNOpts *optsPtr, enum OFNOper oper); -static int GetFileName(ClientData clientData, +static int GetFileName(void *clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], enum OFNOper oper); static int MakeFilterVista(Tcl_Interp *interp, OFNOpts *optsPtr, @@ -588,7 +588,7 @@ static int MakeFilter(Tcl_Interp *interp, Tcl_Obj *valuePtr, static UINT APIENTRY OFNHookProc(HWND hdlg, UINT uMsg, WPARAM wParam, LPARAM lParam); static LRESULT CALLBACK MsgBoxCBTProc(int nCode, WPARAM wParam, LPARAM lParam); -static void SetTkDialog(ClientData clientData); +static void SetTkDialog(void *clientData); static const char *ConvertExternalFilename(LPCWSTR, Tcl_DString *); /* @@ -690,7 +690,7 @@ TkWinDialogDebug( int Tk_ChooseColorObjCmd( - ClientData clientData, /* Main window associated with interpreter. */ + void *clientData, /* Main window associated with interpreter. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ @@ -846,14 +846,13 @@ static UINT CALLBACK ColorDlgHookProc( HWND hDlg, /* Handle to the color dialog. */ UINT uMsg, /* Type of message. */ - WPARAM wParam, /* First message parameter. */ + TCL_UNUSED(WPARAM), /* First message parameter. */ LPARAM lParam) /* Second message parameter. */ { ThreadSpecificData *tsdPtr = (ThreadSpecificData *) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); const char *title; CHOOSECOLORW *ccPtr; - (void)wParam; if (WM_INITDIALOG == uMsg) { @@ -899,7 +898,7 @@ ColorDlgHookProc( int Tk_GetOpenFileObjCmd( - ClientData clientData, /* Main window associated with interpreter. */ + void *clientData, /* Main window associated with interpreter. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ @@ -926,7 +925,7 @@ Tk_GetOpenFileObjCmd( int Tk_GetSaveFileObjCmd( - ClientData clientData, /* Main window associated with interpreter. */ + void *clientData, /* Main window associated with interpreter. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ @@ -973,7 +972,7 @@ static void CleanupOFNOptions(OFNOpts *optsPtr) static int ParseOFNOptions( - ClientData clientData, /* Main window associated with interpreter. */ + void *clientData, /* Main window associated with interpreter. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[], /* Argument objects. */ @@ -1811,7 +1810,7 @@ end: static int GetFileName( - ClientData clientData, /* Main window associated with interpreter. */ + void *clientData, /* Main window associated with interpreter. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[], /* Argument objects. */ @@ -1858,14 +1857,13 @@ static UINT APIENTRY OFNHookProc( HWND hdlg, /* Handle to child dialog window. */ UINT uMsg, /* Message identifier */ - WPARAM wParam, /* Message parameter */ + TCL_UNUSED(WPARAM), /* Message parameter */ LPARAM lParam) /* Message parameter */ { ThreadSpecificData *tsdPtr = (ThreadSpecificData *) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); OPENFILENAME *ofnPtr; OFNData *ofnData; - (void)wParam; if (uMsg == WM_INITDIALOG) { TkWinSetUserData(hdlg, lParam); @@ -2369,7 +2367,7 @@ static int MakeFilterVista( int Tk_ChooseDirectoryObjCmd( - ClientData clientData, /* Main window associated with interpreter. */ + void *clientData, /* Main window associated with interpreter. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ @@ -2727,7 +2725,7 @@ ChooseDirectoryValidateProc( int Tk_MessageBoxObjCmd( - ClientData clientData, /* Main window associated with interpreter. */ + void *clientData, /* Main window associated with interpreter. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ @@ -2961,7 +2959,7 @@ MsgBoxCBTProc( static void SetTkDialog( - ClientData clientData) + void *clientData) { ThreadSpecificData *tsdPtr = (ThreadSpecificData *) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); @@ -3232,14 +3230,15 @@ FontchooserCget( static int FontchooserConfigureCmd( - ClientData clientData, /* Main window */ + void *clientData, /* Main window */ Tcl_Interp *interp, - int objc, + Tcl_Size objc, Tcl_Obj *const objv[]) { Tk_Window tkwin = (Tk_Window)clientData; HookData *hdPtr = NULL; - int i, r = TCL_OK; + Tcl_Size i; + int r = TCL_OK; static const char *const optionStrings[] = { "-command", "-font", "-parent", "-title", "-visible", NULL }; @@ -3375,10 +3374,10 @@ FontchooserConfigureCmd( static int FontchooserShowCmd( - ClientData clientData, /* Main window */ + void *clientData, /* Main window */ Tcl_Interp *interp, - int objc, - Tcl_Obj *const objv[]) + TCL_UNUSED(Tcl_Size), + TCL_UNUSED(Tcl_Obj *const *)) { Tcl_DString ds; Tk_Window tkwin = (Tk_Window)clientData, parent; @@ -3387,8 +3386,6 @@ FontchooserShowCmd( HDC hdc; HookData *hdPtr; int r = TCL_OK, oldMode = 0; - (void)objc; - (void)objv; hdPtr = (HookData *)Tcl_GetAssocData(interp, "::tk::fontchooser", NULL); @@ -3491,15 +3488,12 @@ FontchooserShowCmd( static int FontchooserHideCmd( - ClientData dummy, /* Main window */ + TCL_UNUSED(void *), Tcl_Interp *interp, - int objc, - Tcl_Obj *const objv[]) + TCL_UNUSED(Tcl_Size), + TCL_UNUSED(Tcl_Obj *const *)) { HookData *hdPtr = (HookData *)Tcl_GetAssocData(interp, "::tk::fontchooser", NULL); - (void)dummy; - (void)objc; - (void)objv; if (hdPtr->hwnd && IsWindow(hdPtr->hwnd)) { EndDialog(hdPtr->hwnd, 0); @@ -3519,10 +3513,11 @@ FontchooserHideCmd( */ static void -DeleteHookData(ClientData clientData, Tcl_Interp *dummy) +DeleteHookData( + void *clientData, + TCL_UNUSED(Tcl_Interp *)) { HookData *hdPtr = (HookData *)clientData; - (void)dummy; if (hdPtr->parentObj) { Tcl_DecrRefCount(hdPtr->parentObj); @@ -3559,10 +3554,11 @@ const TkEnsemble tkFontchooserEnsemble[] = { }; int -TkInitFontchooser(Tcl_Interp *interp, ClientData dummy) +TkInitFontchooser( + Tcl_Interp *interp, + TCL_UNUSED(void *)) { HookData *hdPtr = (HookData *)ckalloc(sizeof(HookData)); - (void)dummy; memset(hdPtr, 0, sizeof(HookData)); Tcl_SetAssocData(interp, "::tk::fontchooser", DeleteHookData, hdPtr); diff --git a/win/tkWinSend.c b/win/tkWinSend.c index f21af01..e3111e6 100644 --- a/win/tkWinSend.c +++ b/win/tkWinSend.c @@ -62,8 +62,8 @@ static Tcl_ThreadDataKey dataKey; */ #ifdef TK_SEND_ENABLED_ON_WINDOWS -static void CmdDeleteProc(ClientData clientData); -static void InterpDeleteProc(ClientData clientData, +static void CmdDeleteProc(void *clientData); +static void InterpDeleteProc(void *clientData, Tcl_Interp *interp); static void RevokeObjectRegistration(RegisteredInterp *riPtr); #endif /* TK_SEND_ENABLED_ON_WINDOWS */ @@ -75,7 +75,7 @@ static HRESULT RegisterInterp(const char *name, static int FindInterpreterObject(Tcl_Interp *interp, const char *name, LPDISPATCH *ppdisp); static int Send(LPDISPATCH pdispInterp, Tcl_Interp *interp, - int async, ClientData clientData, int objc, + int async, void *clientData, Tcl_Size objc, Tcl_Obj *const objv[]); static void SendTrace(const char *format, ...); static Tcl_EventProc SendEventProc; @@ -322,7 +322,7 @@ TkGetInterpNames( int Tk_SendObjCmd( - ClientData clientData, /* Information about sender (only dispPtr + void *clientData, /* Information about sender (only dispPtr * field is used). */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ @@ -488,7 +488,7 @@ FindInterpreterObject( #ifdef TK_SEND_ENABLED_ON_WINDOWS static void CmdDeleteProc( - ClientData clientData) + void *clientData) { RegisteredInterp *riPtr = (RegisteredInterp *)clientData; @@ -587,7 +587,7 @@ RevokeObjectRegistration( #ifdef TK_SEND_ENABLED_ON_WINDOWS static void InterpDeleteProc( - ClientData clientData, + void *clientData, Tcl_Interp *interp) { CoUninitialize(); @@ -739,9 +739,8 @@ Send( * object. */ Tcl_Interp *interp, /* The local interpreter. */ int async, /* Flag for the calling style. */ - ClientData dummy, /* The RegisteredInterp structure for this - * interp. */ - int objc, /* Number of arguments to be sent. */ + TCL_UNUSED(void *), + Tcl_Size objc, /* Number of arguments to be sent. */ Tcl_Obj *const objv[]) /* The arguments to be sent. */ { VARIANT vCmd, vResult; @@ -753,7 +752,6 @@ Send( DISPID dispid; Tcl_DString ds; const char *src; - (void)dummy; cmd = Tcl_ConcatObj(objc, objv); @@ -970,10 +968,9 @@ TkWinSend_QueueCommand( static int SendEventProc( Tcl_Event *eventPtr, - int flags) + TCL_UNUSED(int)) { SendEvent *evPtr = (SendEvent *)eventPtr; - (void)flags; TRACE("SendEventProc\n"); diff --git a/win/tkWinTest.c b/win/tkWinTest.c index 24d5cb1..4ecd114 100644 --- a/win/tkWinTest.c +++ b/win/tkWinTest.c @@ -24,19 +24,19 @@ HWND tkWinCurrentDialog; * Forward declarations of functions defined later in this file: */ -static int TestclipboardObjCmd(ClientData clientData, +static int TestclipboardObjCmd(void *clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); -static int TestwineventObjCmd(ClientData clientData, +static int TestwineventObjCmd(void *clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); -static int TestfindwindowObjCmd(ClientData clientData, +static int TestfindwindowObjCmd(void *clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); -static int TestgetwindowinfoObjCmd(ClientData clientData, +static int TestgetwindowinfoObjCmd(void *clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); -static int TestwinlocaleObjCmd(ClientData clientData, +static int TestwinlocaleObjCmd(void *clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); static Tk_GetSelProc SetSelectionResult; @@ -227,19 +227,17 @@ AppendSystemError( static int SetSelectionResult( - ClientData dummy, + TCL_UNUSED(void *), Tcl_Interp *interp, const char *selection) { - (void)dummy; - Tcl_AppendResult(interp, selection, NULL); return TCL_OK; } static int TestclipboardObjCmd( - ClientData clientData, /* Main window for application. */ + void *clientData, /* Main window for application. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument values. */ @@ -273,7 +271,7 @@ TestclipboardObjCmd( static int TestwineventObjCmd( - ClientData dummy, /* Main window for application. */ + TCL_UNUSED(void *), Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument strings. */ @@ -306,7 +304,6 @@ TestwineventObjCmd( {WM_COMMAND, "WM_COMMAND"}, {-1, NULL} }; - (void)dummy; if ((objc == 3) && (strcmp(Tcl_GetString(objv[1]), "debug") == 0)) { int b; @@ -442,7 +439,7 @@ TestwineventObjCmd( static int TestfindwindowObjCmd( - ClientData dummy, /* Main window for application. */ + TCL_UNUSED(void *), Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument values. */ @@ -452,7 +449,6 @@ TestfindwindowObjCmd( HWND hwnd = NULL; int r = TCL_OK; DWORD myPid; - (void)dummy; Tcl_DStringInit(&classString); Tcl_DStringInit(&titleString); @@ -515,7 +511,7 @@ EnumChildrenProc( static int TestgetwindowinfoObjCmd( - ClientData dummy, + TCL_UNUSED(void *), Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) @@ -526,7 +522,6 @@ TestgetwindowinfoObjCmd( WCHAR buf[512]; int cch, cchBuf = 256; Tcl_DString ds; - (void)dummy; if (objc != 2) { Tcl_WrongNumArgs(interp, 1, objv, "hwnd"); @@ -573,13 +568,11 @@ TestgetwindowinfoObjCmd( static int TestwinlocaleObjCmd( - ClientData dummy, /* Main window for application. */ + TCL_UNUSED(void *), /* Main window for application. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument values. */ { - (void)dummy; - if (objc != 1) { Tcl_WrongNumArgs(interp, 1, objv, NULL); return TCL_ERROR; diff --git a/win/tkWinX.c b/win/tkWinX.c index a3cba71..9594cb0 100644 --- a/win/tkWinX.c +++ b/win/tkWinX.c @@ -119,12 +119,11 @@ void TkGetServerInfo( Tcl_Interp *interp, /* The server information is returned in this * interpreter's result. */ - Tk_Window tkwin) /* Token for window; this selects a particular + TCL_UNUSED(Tk_Window)) /* Token for window; this selects a particular * display and server. */ { static char buffer[32]; /* Empty string means not initialized yet. */ OSVERSIONINFOW os; - (void)tkwin; if (!buffer[0]) { GetVersionExW(&os); @@ -282,7 +281,7 @@ TkWinXInit( void TkWinXCleanup( - ClientData clientData) + void *clientData) { HINSTANCE hInstance = (HINSTANCE)clientData; @@ -390,11 +389,9 @@ TkWinGetPlatformTheme(void) const char * TkGetDefaultScreenName( - Tcl_Interp *dummy, /* Not used. */ + TCL_UNUSED(Tcl_Interp *), const char *screenName) /* If NULL, use default string. */ { - (void)dummy; - if ((screenName == NULL) || (screenName[0] == '\0')) { screenName = winScreenName; } @@ -707,12 +704,9 @@ TkClipCleanup( int XBell( - Display *display, - int percent) + TCL_UNUSED(Display *), + TCL_UNUSED(int)) { - (void)display; - (void)percent; - MessageBeep(MB_OK); return Success; } @@ -1957,10 +1951,9 @@ Tk_SetCaretPos( long Tk_GetUserInactiveTime( - Display *dpy) /* Ignored on Windows */ + TCL_UNUSED(Display *)) { LASTINPUTINFO li; - (void)dpy; li.cbSize = sizeof(li); if (!GetLastInputInfo(&li)) { @@ -1993,10 +1986,9 @@ Tk_GetUserInactiveTime( void Tk_ResetUserInactiveTime( - Display *dpy) + TCL_UNUSED(Display *)) { INPUT inp; - (void)dpy; inp.type = INPUT_MOUSE; inp.mi.dx = 0; diff --git a/win/ttkWinTheme.c b/win/ttkWinTheme.c index 56e6882..7a4a908 100644 --- a/win/ttkWinTheme.c +++ b/win/ttkWinTheme.c @@ -144,15 +144,16 @@ static const FrameControlElementData FrameControlElements[] = { /* ---------------------------------------------------------------------- */ static void FrameControlElementSize( - void *clientData, void *elementRecord, Tk_Window tkwin, - int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr) + void *clientData, + TCL_UNUSED(void *), + TCL_UNUSED(Tk_Window), + int *widthPtr, + int *heightPtr, + TCL_UNUSED(Ttk_Padding *)) { FrameControlElementData *p = (FrameControlElementData *)clientData; int cx = GETMETRIC(p->cxId); int cy = GETMETRIC(p->cyId); - (void)elementRecord; - (void)tkwin; - (void)paddingPtr; if (p->cxId & _HALFMETRIC) cx /= 2; if (p->cyId & _HALFMETRIC) cy /= 2; @@ -161,14 +162,17 @@ static void FrameControlElementSize( } static void FrameControlElementDraw( - void *clientData, void *elementRecord, Tk_Window tkwin, - Drawable d, Ttk_Box b, unsigned int state) + void *clientData, + TCL_UNUSED(void *), + Tk_Window tkwin, + Drawable d, + Ttk_Box b, + unsigned int state) { FrameControlElementData *elementData = (FrameControlElementData *)clientData; RECT rc = BoxToRect(Ttk_PadBox(b, elementData->margins)); TkWinDCState dcState; HDC hdc = TkWinGetDrawableDC(Tk_Display(tkwin), d, &dcState); - (void)elementRecord; DrawFrameControl(hdc, &rc, elementData->classId, @@ -198,30 +202,30 @@ static const Ttk_ElementOptionSpec BorderElementOptions[] = { }; static void BorderElementSize( - void *dummy, void *elementRecord, Tk_Window tkwin, - int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr) + TCL_UNUSED(void *), + TCL_UNUSED(void *), + TCL_UNUSED(Tk_Window), + TCL_UNUSED(int *), + TCL_UNUSED(int *), + Ttk_Padding *paddingPtr) { - (void)dummy; - (void)elementRecord; - (void)tkwin; - (void)widthPtr; - (void)heightPtr; - paddingPtr->left = paddingPtr->right = GetSystemMetrics(SM_CXEDGE); paddingPtr->top = paddingPtr->bottom = GetSystemMetrics(SM_CYEDGE); } static void BorderElementDraw( - void *dummy, void *elementRecord, Tk_Window tkwin, - Drawable d, Ttk_Box b, unsigned int state) + TCL_UNUSED(void *), + void *elementRecord, + Tk_Window tkwin, + Drawable d, + Ttk_Box b, + TCL_UNUSED(unsigned int)) { BorderElement *border = (BorderElement *)elementRecord; RECT rc = BoxToRect(b); int relief = TK_RELIEF_FLAT; TkWinDCState dcState; HDC hdc; - (void)dummy; - (void)state; Tk_GetReliefFromObj(NULL, border->reliefObj, &relief); @@ -257,30 +261,30 @@ static const Ttk_ElementOptionSpec FieldElementOptions[] = { }; static void FieldElementSize( - void *dummy, void *elementRecord, Tk_Window tkwin, - int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr) + TCL_UNUSED(void *), + TCL_UNUSED(void *), + TCL_UNUSED(Tk_Window), + TCL_UNUSED(int *), + TCL_UNUSED(int *), + Ttk_Padding *paddingPtr) { - (void)dummy; - (void)elementRecord; - (void)tkwin; - (void)widthPtr; - (void)heightPtr; - paddingPtr->left = paddingPtr->right = GetSystemMetrics(SM_CXEDGE); paddingPtr->top = paddingPtr->bottom = GetSystemMetrics(SM_CYEDGE); } static void FieldElementDraw( - void *dummy, void *elementRecord, Tk_Window tkwin, - Drawable d, Ttk_Box b, unsigned int state) + TCL_UNUSED(void *), + void *elementRecord, + Tk_Window tkwin, + Drawable d, + Ttk_Box b, + TCL_UNUSED(unsigned int)) { FieldElement *field = (FieldElement *)elementRecord; Tk_3DBorder bg = Tk_Get3DBorderFromObj(tkwin, field->backgroundObj); RECT rc = BoxToRect(b); TkWinDCState dcState; HDC hdc; - (void)dummy; - (void)state; Tk_Fill3DRectangle( tkwin, d, bg, b.x, b.y, b.width, b.height, 0, TK_RELIEF_FLAT); @@ -320,17 +324,17 @@ static const Ttk_ElementOptionSpec ButtonBorderElementOptions[] = { }; static void ButtonBorderElementSize( - void *dummy, void *elementRecord, Tk_Window tkwin, - int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr) + TCL_UNUSED(void *), + void *elementRecord, + TCL_UNUSED(Tk_Window), + TCL_UNUSED(int *), + TCL_UNUSED(int *), + Ttk_Padding *paddingPtr) { ButtonBorderElement *bd = (ButtonBorderElement *)elementRecord; int relief = TK_RELIEF_RAISED; Ttk_ButtonDefaultState defaultState = TTK_BUTTON_DEFAULT_DISABLED; short int cx, cy; - (void)dummy; - (void)tkwin; - (void)widthPtr; - (void)heightPtr; Tk_GetReliefFromObj(NULL, bd->reliefObj, &relief); Ttk_GetButtonDefaultStateFromObj(NULL, bd->defaultStateObj, &defaultState); @@ -352,8 +356,12 @@ static void ButtonBorderElementSize( } static void ButtonBorderElementDraw( - void *dummy, void *elementRecord, Tk_Window tkwin, - Drawable d, Ttk_Box b, unsigned int state) + TCL_UNUSED(void *), + void *elementRecord, + Tk_Window tkwin, + Drawable d, + Ttk_Box b, + unsigned int state) { ButtonBorderElement *bd = (ButtonBorderElement *)elementRecord; int relief = TK_RELIEF_FLAT; @@ -361,7 +369,6 @@ static void ButtonBorderElementDraw( TkWinDCState dcState; HDC hdc; RECT rc; - (void)dummy; Tk_GetReliefFromObj(NULL, bd->reliefObj, &relief); Ttk_GetButtonDefaultStateFromObj(NULL, bd->defaultStateObj, &defaultState); @@ -407,25 +414,24 @@ static const Ttk_ElementSpec ButtonBorderElementSpec = { */ static void FocusElementSize( - void *dummy, void *elementRecord, Tk_Window tkwin, - int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr) + TCL_UNUSED(void *), + TCL_UNUSED(void *), + TCL_UNUSED(Tk_Window), + TCL_UNUSED(int *), + TCL_UNUSED(int *), + Ttk_Padding *paddingPtr) { - (void)dummy; - (void)elementRecord; - (void)tkwin; - (void)widthPtr; - (void)heightPtr; - *paddingPtr = Ttk_UniformPadding(1); } static void FocusElementDraw( - void *dummy, void *elementRecord, Tk_Window tkwin, - Drawable d, Ttk_Box b, unsigned int state) + TCL_UNUSED(void *), + TCL_UNUSED(void *), + Tk_Window tkwin, + Drawable d, + Ttk_Box b, + unsigned int state) { - (void)dummy; - (void)elementRecord; - if (state & TTK_STATE_FOCUS) { RECT rc = BoxToRect(b); TkWinDCState dcState; @@ -459,11 +465,14 @@ static const Ttk_ElementOptionSpec FillFocusElementOptions[] = { /* @@@ FIX THIS */ static void FillFocusElementDraw( - void *dummy, void *elementRecord, Tk_Window tkwin, - Drawable d, Ttk_Box b, unsigned int state) + TCL_UNUSED(void *), + void *elementRecord, + Tk_Window tkwin, + Drawable d, + Ttk_Box b, + unsigned int state) { FillFocusElement *focus = (FillFocusElement *)elementRecord; - (void)dummy; if (state & TTK_STATE_FOCUS) { RECT rc = BoxToRect(b); @@ -535,16 +544,18 @@ static TroughClientData *TroughClientDataInit(Tcl_Interp *interp) } static void TroughElementDraw( - void *clientData, void *elementRecord, Tk_Window tkwin, - Drawable d, Ttk_Box b, unsigned int state) + void *clientData, + TCL_UNUSED(void *), + Tk_Window tkwin, + Drawable d, + Ttk_Box b, + TCL_UNUSED(unsigned int)) { TroughClientData *cd = (TroughClientData *)clientData; TkWinDCState dcState; HDC hdc = TkWinGetDrawableDC(Tk_Display(tkwin), d, &dcState); HBRUSH hbr; COLORREF bk, oldbk, oldtxt; - (void)elementRecord; - (void)state; hbr = (HBRUSH)SelectObject(hdc, GetSysColorBrush(COLOR_SCROLLBAR)); bk = GetSysColor(COLOR_3DHIGHLIGHT); @@ -586,14 +597,15 @@ static const Ttk_ElementOptionSpec ThumbElementOptions[] = { }; static void ThumbElementSize( - void *dummy, void *elementRecord, Tk_Window tkwin, - int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr) + TCL_UNUSED(void *), + void *elementRecord, + TCL_UNUSED(Tk_Window), + int *widthPtr, + int *heightPtr, + TCL_UNUSED(Ttk_Padding *)) { ThumbElement *thumbPtr = (ThumbElement *)elementRecord; Ttk_Orient orient; - (void)dummy; - (void)tkwin; - (void)paddingPtr; TtkGetOrientFromObj(NULL, thumbPtr->orientObj, &orient); if (orient == TTK_ORIENT_HORIZONTAL) { @@ -606,14 +618,16 @@ static void ThumbElementSize( } static void ThumbElementDraw( - void *dummy, void *elementRecord, Tk_Window tkwin, - Drawable d, Ttk_Box b, unsigned int state) + TCL_UNUSED(void *), + TCL_UNUSED(void *), + Tk_Window tkwin, + Drawable d, + Ttk_Box b, + unsigned int state) { RECT rc = BoxToRect(b); TkWinDCState dcState; HDC hdc; - (void)dummy; - (void)elementRecord; /* Windows doesn't show a thumb when the scrollbar is disabled */ if (state & TTK_STATE_DISABLED) @@ -648,14 +662,15 @@ static const Ttk_ElementOptionSpec SliderElementOptions[] = { }; static void SliderElementSize( - void *dummy, void *elementRecord, Tk_Window tkwin, - int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr) + TCL_UNUSED(void *), + void *elementRecord, + TCL_UNUSED(Tk_Window), + int *widthPtr, + int *heightPtr, + TCL_UNUSED(Ttk_Padding *)) { SliderElement *slider = (SliderElement *)elementRecord; Ttk_Orient orient; - (void)dummy; - (void)tkwin; - (void)paddingPtr; TtkGetOrientFromObj(NULL, slider->orientObj, &orient); if (orient == TTK_ORIENT_HORIZONTAL) { @@ -668,15 +683,16 @@ static void SliderElementSize( } static void SliderElementDraw( - void *dummy, void *elementRecord, Tk_Window tkwin, - Drawable d, Ttk_Box b, unsigned int state) + TCL_UNUSED(void *), + TCL_UNUSED(void *), + Tk_Window tkwin, + Drawable d, + Ttk_Box b, + TCL_UNUSED(unsigned int)) { RECT rc = BoxToRect(b); TkWinDCState dcState; HDC hdc; - (void)dummy; - (void)elementRecord; - (void)state; hdc = TkWinGetDrawableDC(Tk_Display(tkwin), d, &dcState); DrawEdge(hdc, &rc, EDGE_RAISED, BF_RECT | BF_MIDDLE); @@ -696,29 +712,28 @@ static const Ttk_ElementSpec SliderElementSpec = { */ static void ClientElementSize( - void *dummy, void *elementRecord, Tk_Window tkwin, - int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr) + TCL_UNUSED(void *), + TCL_UNUSED(void *), + TCL_UNUSED(Tk_Window), + TCL_UNUSED(int *), + TCL_UNUSED(int *), + Ttk_Padding *paddingPtr) { - (void)dummy; - (void)elementRecord; - (void)tkwin; - (void)widthPtr; - (void)heightPtr; - paddingPtr->left = paddingPtr->right = GetSystemMetrics(SM_CXEDGE); paddingPtr->top = paddingPtr->bottom = GetSystemMetrics(SM_CYEDGE); } static void ClientElementDraw( - void *dummy, void *elementRecord, Tk_Window tkwin, - Drawable d, Ttk_Box b, unsigned int state) + TCL_UNUSED(void *), + TCL_UNUSED(void *), + Tk_Window tkwin, + Drawable d, + Ttk_Box b, + TCL_UNUSED(unsigned int)) { RECT rc = BoxToRect(b); TkWinDCState dcState; HDC hdc = TkWinGetDrawableDC(Tk_Display(tkwin), d, &dcState); - (void)dummy; - (void)elementRecord; - (void)state; DrawEdge(hdc, &rc, EDGE_RAISED, BF_RECT | BF_SOFT); TkWinReleaseDrawableDC(d, hdc, &dcState); @@ -755,11 +770,12 @@ TTK_END_LAYOUT_TABLE /* ---------------------------------------------------------------------- */ MODULE_SCOPE -int TtkWinTheme_Init(Tcl_Interp *interp, HWND hwnd) +int TtkWinTheme_Init( + Tcl_Interp *interp, + TCL_UNUSED(HWND)) { Ttk_Theme themePtr, parentPtr; const FrameControlElementData *fce = FrameControlElements; - (void)hwnd; parentPtr = Ttk_GetTheme(interp, "alt"); themePtr = Ttk_CreateTheme(interp, "winnative", parentPtr); diff --git a/win/ttkWinXPTheme.c b/win/ttkWinXPTheme.c index 0d5c06f..0365867 100644 --- a/win/ttkWinXPTheme.c +++ b/win/ttkWinXPTheme.c @@ -140,12 +140,13 @@ XPThemeDeleteProc(void *clientData) } static int -XPThemeEnabled(Ttk_Theme theme, void *clientData) +XPThemeEnabled( + TCL_UNUSED(Ttk_Theme), + void *clientData) { XPThemeData *themeData = (XPThemeData *)clientData; int active = themeData->procs->IsThemeActive(); int themed = themeData->procs->IsAppThemed(); - (void)theme; return (active && themed); } @@ -492,13 +493,16 @@ FreeElementData(ElementData *elementData) */ static void GenericElementSize( - void *clientData, void *elementRecord, Tk_Window tkwin, - int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr) + void *clientData, + TCL_UNUSED(void *), + Tk_Window tkwin, + int *widthPtr, + int *heightPtr, + Ttk_Padding *paddingPtr) { ElementData *elementData = (ElementData *)clientData; HRESULT result; SIZE size; - (void)elementRecord; if (!InitElementData(elementData, tkwin, 0)) return; @@ -529,12 +533,15 @@ static void GenericElementSize( } static void GenericElementDraw( - void *clientData, void *elementRecord, Tk_Window tkwin, - Drawable d, Ttk_Box b, unsigned int state) + void *clientData, + TCL_UNUSED(void *), + Tk_Window tkwin, + Drawable d, + Ttk_Box b, + unsigned int state) { ElementData *elementData = (ElementData *)clientData; RECT rc; - (void)elementRecord; if (!InitElementData(elementData, tkwin, d)) { return; @@ -640,13 +647,16 @@ static const Ttk_ElementSpec SpinboxArrowElementSpec = { */ static void ThumbElementDraw( - void *clientData, void *elementRecord, Tk_Window tkwin, - Drawable d, Ttk_Box b, unsigned int state) + void *clientData, + TCL_UNUSED(void *), + Tk_Window tkwin, + Drawable d, + Ttk_Box b, + unsigned int state) { ElementData *elementData = (ElementData *)clientData; unsigned stateId = Ttk_StateTableLookup(elementData->info->statemap, state); RECT rc = BoxToRect(b); - (void)elementRecord; /* * Don't draw the thumb if we are disabled. @@ -720,13 +730,16 @@ static const Ttk_ElementSpec PbarElementSpec = * we can use the same statemap no matter what the partId. */ static void TabElementDraw( - void *clientData, void *elementRecord, Tk_Window tkwin, - Drawable d, Ttk_Box b, unsigned int state) + void *clientData, + TCL_UNUSED(void *), + Tk_Window tkwin, + Drawable d, + Ttk_Box b, + unsigned int state) { ElementData *elementData = (ElementData *)clientData; int partId = elementData->info->partId; RECT rc = BoxToRect(b); - (void)elementRecord; if (!InitElementData(elementData, tkwin, d)) return; @@ -863,7 +876,7 @@ static void TextElementSize( } static void TextElementDraw( - ClientData clientData, void *elementRecord, Tk_Window tkwin, + void *clientData, void *elementRecord, Tk_Window tkwin, Drawable d, Ttk_Box b, unsigned int state) { TextElement *element = elementRecord; @@ -1114,7 +1127,7 @@ Ttk_CreateVsapiElement( { XPThemeData *themeData = (XPThemeData *)clientData; ElementInfo *elementPtr = NULL; - ClientData elementData; + void *elementData; LPCWSTR className; int partId = 0; Ttk_StateTable *stateTable; @@ -1327,7 +1340,7 @@ MODULE_SCOPE int TtkXPTheme_Init(Tcl_Interp *interp, HWND hwnd) * New elements: */ for (infoPtr = ElementInfoTable; infoPtr->elementName != 0; ++infoPtr) { - ClientData clientData = NewElementData(procs, infoPtr); + void *clientData = NewElementData(procs, infoPtr); Ttk_RegisterElementSpec( themePtr, infoPtr->elementName, infoPtr->elementSpec, clientData); Ttk_RegisterCleanup(interp, clientData, DestroyElementData); |