summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--generic/ttk/ttkButton.c4
-rw-r--r--generic/ttk/ttkDefaultTheme.c4
-rw-r--r--generic/ttk/ttkElements.c8
-rw-r--r--generic/ttk/ttkEntry.c5
-rw-r--r--generic/ttk/ttkFrame.c4
-rw-r--r--generic/ttk/ttkImage.c4
-rw-r--r--generic/ttk/ttkLabel.c4
-rw-r--r--generic/ttk/ttkLayout.c1
-rw-r--r--generic/ttk/ttkNotebook.c4
-rw-r--r--generic/ttk/ttkPanedwindow.c11
-rw-r--r--generic/ttk/ttkProgress.c4
-rw-r--r--generic/ttk/ttkScale.c5
-rw-r--r--generic/ttk/ttkScrollbar.c4
-rw-r--r--generic/ttk/ttkSeparator.c4
-rw-r--r--generic/ttk/ttkTheme.c12
-rw-r--r--generic/ttk/ttkTreeview.c4
-rw-r--r--macosx/tkMacOSXTest.c1
-rw-r--r--macosx/ttkMacOSXTheme.c4
-rw-r--r--win/ttkWinTheme.c4
-rw-r--r--win/ttkWinXPTheme.c3
20 files changed, 51 insertions, 43 deletions
diff --git a/generic/ttk/ttkButton.c b/generic/ttk/ttkButton.c
index b096f63..a02bfa5 100644
--- a/generic/ttk/ttkButton.c
+++ b/generic/ttk/ttkButton.c
@@ -863,8 +863,8 @@ TTK_END_LAYOUT
* +++ Initialization.
*/
-MODULE_SCOPE
-void TtkButton_Init(Tcl_Interp *interp)
+MODULE_SCOPE void
+TtkButton_Init(Tcl_Interp *interp)
{
Ttk_Theme theme = Ttk_GetDefaultTheme(interp);
diff --git a/generic/ttk/ttkDefaultTheme.c b/generic/ttk/ttkDefaultTheme.c
index 1e87c7e..58bf85a 100644
--- a/generic/ttk/ttkDefaultTheme.c
+++ b/generic/ttk/ttkDefaultTheme.c
@@ -1321,7 +1321,9 @@ static Ttk_ElementSpec TreeitemIndicatorElementSpec = {
* TtkAltTheme_Init --
* Install alternate theme.
*/
-MODULE_SCOPE int TtkAltTheme_Init(Tcl_Interp *interp)
+
+MODULE_SCOPE int
+TtkAltTheme_Init(Tcl_Interp *interp)
{
Ttk_Theme theme = Ttk_CreateTheme(interp, "alt", NULL);
diff --git a/generic/ttk/ttkElements.c b/generic/ttk/ttkElements.c
index 543429b..f136a21 100644
--- a/generic/ttk/ttkElements.c
+++ b/generic/ttk/ttkElements.c
@@ -299,7 +299,7 @@ static Ttk_ElementOptionSpec PaddingElementOptions[] = {
Tk_Offset(PaddingElement,paddingObj), "0" },
{ "-relief", TK_OPTION_RELIEF,
Tk_Offset(PaddingElement,reliefObj), "flat" },
- { "-shiftrelief", TK_OPTION_INT,
+ { "-shiftrelief", TK_OPTION_PIXELS,
Tk_Offset(PaddingElement,shiftreliefObj), "0" },
{ NULL, 0, 0, NULL }
};
@@ -314,7 +314,7 @@ static void PaddingElementSize(
Ttk_Padding pad;
Tk_GetReliefFromObj(NULL, padding->reliefObj, &relief);
- Tcl_GetIntFromObj(NULL, padding->shiftreliefObj, &shiftRelief);
+ Tk_GetPixelsFromObj(NULL, tkwin, padding->shiftreliefObj, &shiftRelief);
Ttk_GetPaddingFromObj(NULL,tkwin,padding->paddingObj,&pad);
*paddingPtr = Ttk_RelievePadding(pad, relief, shiftRelief);
}
@@ -1529,8 +1529,8 @@ static Ttk_ElementSpec ClientElementSpec = {
* Register default element implementations.
*/
-MODULE_SCOPE
-void TtkElements_Init(Tcl_Interp *interp)
+MODULE_SCOPE void
+TtkElements_Init(Tcl_Interp *interp)
{
Ttk_Theme theme = Ttk_GetDefaultTheme(interp);
diff --git a/generic/ttk/ttkEntry.c b/generic/ttk/ttkEntry.c
index 4ff6716..2ee148a 100644
--- a/generic/ttk/ttkEntry.c
+++ b/generic/ttk/ttkEntry.c
@@ -2134,8 +2134,9 @@ TTK_END_LAYOUT
/*------------------------------------------------------------------------
* +++ Initialization.
*/
-MODULE_SCOPE
-void TtkEntry_Init(Tcl_Interp *interp)
+
+MODULE_SCOPE void
+TtkEntry_Init(Tcl_Interp *interp)
{
Ttk_Theme themePtr = Ttk_GetDefaultTheme(interp);
diff --git a/generic/ttk/ttkFrame.c b/generic/ttk/ttkFrame.c
index b8b3477..0570502 100644
--- a/generic/ttk/ttkFrame.c
+++ b/generic/ttk/ttkFrame.c
@@ -654,8 +654,8 @@ TTK_END_LAYOUT
* +++ Initialization.
*/
-MODULE_SCOPE
-void TtkFrame_Init(Tcl_Interp *interp)
+MODULE_SCOPE void
+TtkFrame_Init(Tcl_Interp *interp)
{
Ttk_Theme theme = Ttk_GetDefaultTheme(interp);
diff --git a/generic/ttk/ttkImage.c b/generic/ttk/ttkImage.c
index c47e432..7de4d92 100644
--- a/generic/ttk/ttkImage.c
+++ b/generic/ttk/ttkImage.c
@@ -445,8 +445,8 @@ error:
return TCL_ERROR;
}
-MODULE_SCOPE
-void TtkImage_Init(Tcl_Interp *interp)
+MODULE_SCOPE void
+TtkImage_Init(Tcl_Interp *interp)
{
Ttk_RegisterElementFactory(interp, "image", Ttk_CreateImageElement, NULL);
}
diff --git a/generic/ttk/ttkLabel.c b/generic/ttk/ttkLabel.c
index 850ad2b..c34d479 100644
--- a/generic/ttk/ttkLabel.c
+++ b/generic/ttk/ttkLabel.c
@@ -710,8 +710,8 @@ static Ttk_ElementSpec LabelElementSpec = {
* +++ Initialization.
*/
-MODULE_SCOPE
-void TtkLabel_Init(Tcl_Interp *interp)
+MODULE_SCOPE void
+TtkLabel_Init(Tcl_Interp *interp)
{
Ttk_Theme theme = Ttk_GetDefaultTheme(interp);
diff --git a/generic/ttk/ttkLayout.c b/generic/ttk/ttkLayout.c
index d4c14f3..3e77ba4 100644
--- a/generic/ttk/ttkLayout.c
+++ b/generic/ttk/ttkLayout.c
@@ -257,6 +257,7 @@ Ttk_Box Ttk_PlaceBox(
* Ttk_PositionBox --
* Pack and stick a box according to PositionSpec flags.
*/
+
MODULE_SCOPE Ttk_Box
Ttk_PositionBox(Ttk_Box *cavity, int width, int height, Ttk_PositionSpec flags)
{
diff --git a/generic/ttk/ttkNotebook.c b/generic/ttk/ttkNotebook.c
index 600eca9..160740d 100644
--- a/generic/ttk/ttkNotebook.c
+++ b/generic/ttk/ttkNotebook.c
@@ -1425,8 +1425,8 @@ TTK_END_LAYOUT
* +++ Initialization.
*/
-MODULE_SCOPE
-void TtkNotebook_Init(Tcl_Interp *interp)
+MODULE_SCOPE void
+TtkNotebook_Init(Tcl_Interp *interp)
{
Ttk_Theme themePtr = Ttk_GetDefaultTheme(interp);
diff --git a/generic/ttk/ttkPanedwindow.c b/generic/ttk/ttkPanedwindow.c
index eae99a2..f3ac1dc 100644
--- a/generic/ttk/ttkPanedwindow.c
+++ b/generic/ttk/ttkPanedwindow.c
@@ -925,7 +925,7 @@ typedef struct {
} SashElement;
static Ttk_ElementOptionSpec SashElementOptions[] = {
- { "-sashthickness", TK_OPTION_INT,
+ { "-sashthickness", TK_OPTION_PIXELS,
Tk_Offset(SashElement,thicknessObj), "5" },
{ NULL, TK_OPTION_BOOLEAN, 0, NULL }
};
@@ -933,7 +933,7 @@ static Ttk_ElementOptionSpec SashElementOptions[] = {
static void SashElementSize(
TCL_UNUSED(void *),
void *elementRecord,
- TCL_UNUSED(Tk_Window),
+ Tk_Window tkwin,
int *widthPtr,
int *heightPtr,
TCL_UNUSED(Ttk_Padding *))
@@ -941,7 +941,7 @@ static void SashElementSize(
SashElement *sash = (SashElement *)elementRecord;
int thickness = DEFAULT_SASH_THICKNESS;
- Tcl_GetIntFromObj(NULL, sash->thicknessObj, &thickness);
+ Tk_GetPixelsFromObj(NULL, tkwin, sash->thicknessObj, &thickness);
*widthPtr = *heightPtr = thickness;
}
@@ -968,8 +968,9 @@ TTK_END_LAYOUT
/*------------------------------------------------------------------------
* +++ Registration routine.
*/
-MODULE_SCOPE
-void TtkPanedwindow_Init(Tcl_Interp *interp)
+
+MODULE_SCOPE void
+TtkPanedwindow_Init(Tcl_Interp *interp)
{
Ttk_Theme themePtr = Ttk_GetDefaultTheme(interp);
RegisterWidget(interp, "ttk::panedwindow", &PanedWidgetSpec);
diff --git a/generic/ttk/ttkProgress.c b/generic/ttk/ttkProgress.c
index d83603a..0b6d30f 100644
--- a/generic/ttk/ttkProgress.c
+++ b/generic/ttk/ttkProgress.c
@@ -542,8 +542,8 @@ TTK_END_LAYOUT
* Initialization:
*/
-MODULE_SCOPE
-void TtkProgressbar_Init(Tcl_Interp *interp)
+MODULE_SCOPE void
+TtkProgressbar_Init(Tcl_Interp *interp)
{
Ttk_Theme themePtr = Ttk_GetDefaultTheme(interp);
diff --git a/generic/ttk/ttkScale.c b/generic/ttk/ttkScale.c
index 34ed2e1..a80d6e8 100644
--- a/generic/ttk/ttkScale.c
+++ b/generic/ttk/ttkScale.c
@@ -522,8 +522,9 @@ TTK_END_LAYOUT
/*
* Initialization.
*/
-MODULE_SCOPE
-void TtkScale_Init(Tcl_Interp *interp)
+
+MODULE_SCOPE void
+TtkScale_Init(Tcl_Interp *interp)
{
Ttk_Theme theme = Ttk_GetDefaultTheme(interp);
diff --git a/generic/ttk/ttkScrollbar.c b/generic/ttk/ttkScrollbar.c
index 7663b6b..31f291a 100644
--- a/generic/ttk/ttkScrollbar.c
+++ b/generic/ttk/ttkScrollbar.c
@@ -331,8 +331,8 @@ TTK_END_LAYOUT
* +++ Initialization.
*/
-MODULE_SCOPE
-void TtkScrollbar_Init(Tcl_Interp *interp)
+MODULE_SCOPE void
+TtkScrollbar_Init(Tcl_Interp *interp)
{
Ttk_Theme theme = Ttk_GetDefaultTheme(interp);
diff --git a/generic/ttk/ttkSeparator.c b/generic/ttk/ttkSeparator.c
index 6e305fe..26c169f 100644
--- a/generic/ttk/ttkSeparator.c
+++ b/generic/ttk/ttkSeparator.c
@@ -120,8 +120,8 @@ TTK_END_LAYOUT
/* +++ Initialization:
*/
-MODULE_SCOPE
-void TtkSeparator_Init(Tcl_Interp *interp)
+MODULE_SCOPE void
+TtkSeparator_Init(Tcl_Interp *interp)
{
Ttk_Theme theme = Ttk_GetDefaultTheme(interp);
diff --git a/generic/ttk/ttkTheme.c b/generic/ttk/ttkTheme.c
index 3cea404..730de5d 100644
--- a/generic/ttk/ttkTheme.c
+++ b/generic/ttk/ttkTheme.c
@@ -679,8 +679,8 @@ Ttk_GetResourceCache(Tcl_Interp *interp)
* Register a new layout specification with a style.
* @@@ TODO: Make sure layoutName is not ".", root style must not have a layout
*/
-MODULE_SCOPE
-void Ttk_RegisterLayoutTemplate(
+MODULE_SCOPE void
+Ttk_RegisterLayoutTemplate(
Ttk_Theme theme, /* Target theme */
const char *layoutName, /* Name of new layout */
Ttk_LayoutTemplate layoutTemplate) /* Template */
@@ -1143,8 +1143,8 @@ Ttk_DrawElement(
* Side effects: Sets interp's result.
*/
-MODULE_SCOPE
-int TtkEnumerateHashTable(Tcl_Interp *interp, Tcl_HashTable *ht)
+MODULE_SCOPE int
+TtkEnumerateHashTable(Tcl_Interp *interp, Tcl_HashTable *ht)
{
Tcl_HashSearch search;
Tcl_Obj *result = Tcl_NewListObj(0, NULL);
@@ -1692,8 +1692,8 @@ StyleObjCmd(
return Ttk_InvokeEnsemble(StyleEnsemble, 1, clientData,interp,objc,objv);
}
-MODULE_SCOPE
-int Ttk_InvokeEnsemble( /* Run an ensemble command */
+MODULE_SCOPE int
+Ttk_InvokeEnsemble( /* Run an ensemble command */
const Ttk_Ensemble *ensemble, int cmdIndex,
void *clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
{
diff --git a/generic/ttk/ttkTreeview.c b/generic/ttk/ttkTreeview.c
index ce37e04..0d441e2 100644
--- a/generic/ttk/ttkTreeview.c
+++ b/generic/ttk/ttkTreeview.c
@@ -3479,8 +3479,8 @@ static Ttk_ElementSpec RowElementSpec = {
* +++ Initialisation.
*/
-MODULE_SCOPE
-void TtkTreeview_Init(Tcl_Interp *interp)
+MODULE_SCOPE void
+TtkTreeview_Init(Tcl_Interp *interp)
{
Ttk_Theme theme = Ttk_GetDefaultTheme(interp);
diff --git a/macosx/tkMacOSXTest.c b/macosx/tkMacOSXTest.c
index ad3b108..e7e2a7e 100644
--- a/macosx/tkMacOSXTest.c
+++ b/macosx/tkMacOSXTest.c
@@ -146,6 +146,7 @@ MenuBarHeightObjCmd(
*
*----------------------------------------------------------------------
*/
+
MODULE_SCOPE Bool
TkTestLogDisplay(
Drawable drawable)
diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c
index c6857b3..5465bec 100644
--- a/macosx/ttkMacOSXTheme.c
+++ b/macosx/ttkMacOSXTheme.c
@@ -3333,8 +3333,8 @@ static int AquaTheme_Init(
return TCL_OK;
}
-MODULE_SCOPE
-int Ttk_MacOSXPlatformInit(
+MODULE_SCOPE int
+Ttk_MacOSXPlatformInit(
Tcl_Interp *interp)
{
return AquaTheme_Init(interp);
diff --git a/win/ttkWinTheme.c b/win/ttkWinTheme.c
index 6288da1..79f115f 100644
--- a/win/ttkWinTheme.c
+++ b/win/ttkWinTheme.c
@@ -940,8 +940,8 @@ TTK_END_LAYOUT_TABLE
/* ---------------------------------------------------------------------- */
-MODULE_SCOPE
-int TtkWinTheme_Init(
+MODULE_SCOPE int
+TtkWinTheme_Init(
Tcl_Interp *interp,
TCL_UNUSED(HWND))
{
diff --git a/win/ttkWinXPTheme.c b/win/ttkWinXPTheme.c
index 179bf0e..b01bdcd 100644
--- a/win/ttkWinXPTheme.c
+++ b/win/ttkWinXPTheme.c
@@ -1404,7 +1404,8 @@ retErr:
* +++ Initialization routine:
*/
-MODULE_SCOPE int TtkXPTheme_Init(Tcl_Interp *interp, HWND hwnd)
+MODULE_SCOPE int
+TtkXPTheme_Init(Tcl_Interp *interp, HWND hwnd)
{
XPThemeData *themeData;
XPThemeProcs *procs;
generated by cgit v0.12 at 2024-09-19 22:17:39 (GMT)