summaryrefslogtreecommitdiffstats
path: root/generic/ttk/ttkSeparator.c
diff options
context:
space:
mode:
authordas <das>2006-11-03 03:06:21 (GMT)
committerdas <das>2006-11-03 03:06:21 (GMT)
commit6a21e72df71f06d61c44e3de34afe26973732214 (patch)
treeddde20bc872b7fac3e8a946a67418e60dcc23428 /generic/ttk/ttkSeparator.c
parent576cbeb2f5ccec11ea4ebb71b788d4527ee1aae3 (diff)
downloadtk-6a21e72df71f06d61c44e3de34afe26973732214.zip
tk-6a21e72df71f06d61c44e3de34afe26973732214.tar.gz
tk-6a21e72df71f06d61c44e3de34afe26973732214.tar.bz2
* generic/ttk/ttkBlink.c, generic/ttk/ttkButton.c:
* generic/ttk/ttkClamTheme.c, generic/ttk/ttkClassicTheme.c: * generic/ttk/ttkDecls.h, generic/ttk/ttkDefaultTheme.c: * generic/ttk/ttkElements.c, generic/ttk/ttkEntry.c: * generic/ttk/ttkFrame.c, generic/ttk/ttkImage.c: * generic/ttk/ttkInit.c, generic/ttk/ttkLabel.c: * generic/ttk/ttkLayout.c, generic/ttk/ttkManager.h: * generic/ttk/ttkNotebook.c, generic/ttk/ttkPanedwindow.c: * generic/ttk/ttkProgress.c, generic/ttk/ttkScale.c: * generic/ttk/ttkScroll.c, generic/ttk/ttkScrollbar.c: * generic/ttk/ttkSeparator.c, generic/ttk/ttkSquare.c: * generic/ttk/ttkStubInit.c, generic/ttk/ttkStubLib.c: * generic/ttk/ttkTheme.c, generic/ttk/ttkTheme.h: * generic/ttk/ttkThemeInt.h, generic/ttk/ttkTrack.c: * generic/ttk/ttkTreeview.c, generic/ttk/ttkWidget.c: * generic/ttk/ttkWidget.h, macosx/ttkMacOSXTheme.c: * win/ttkWinMonitor.c, win/ttkWinTheme.c, win/ttkWinXPTheme.c: ensure all global Ttk symbols have Ttk or ttk prefix; declare all externally visible Ttk symbols not contained in stubs table as MODULE_SCOPE (or as static when possible); so that 'make check{exports,stubs}' once again complete without errors.
Diffstat (limited to 'generic/ttk/ttkSeparator.c')
-rw-r--r--generic/ttk/ttkSeparator.c66
1 files changed, 34 insertions, 32 deletions
diff --git a/generic/ttk/ttkSeparator.c b/generic/ttk/ttkSeparator.c
index 7914928..feb8763 100644
--- a/generic/ttk/ttkSeparator.c
+++ b/generic/ttk/ttkSeparator.c
@@ -1,4 +1,4 @@
-/* $Id: ttkSeparator.c,v 1.1 2006/10/31 01:42:26 hobbs Exp $
+/* $Id: ttkSeparator.c,v 1.2 2006/11/03 03:06:22 das Exp $
*
* Copyright (c) 2004, Joe English
*
@@ -29,9 +29,9 @@ static Tk_OptionSpec SeparatorOptionSpecs[] =
{TK_OPTION_STRING_TABLE, "-orient", "orient", "Orient", "horizontal",
Tk_Offset(Separator,separator.orientObj),
Tk_Offset(Separator,separator.orient),
- 0,(ClientData)TTKOrientStrings,STYLE_CHANGED },
+ 0,(ClientData)ttkOrientStrings,STYLE_CHANGED },
- WIDGET_INHERIT_OPTIONS(CoreOptionSpecs)
+ WIDGET_INHERIT_OPTIONS(ttkCoreOptionSpecs)
};
/*
@@ -42,7 +42,7 @@ static Ttk_Layout SeparatorGetLayout(
Tcl_Interp *interp, Ttk_Theme theme, void *recordPtr)
{
Separator *sep = recordPtr;
- return WidgetGetOrientedLayout(
+ return TtkWidgetGetOrientedLayout(
interp, theme, recordPtr, sep->separator.orientObj);
}
@@ -51,31 +51,32 @@ static Ttk_Layout SeparatorGetLayout(
*/
static WidgetCommandSpec SeparatorCommands[] =
{
- { "configure", WidgetConfigureCommand },
- { "cget", WidgetCgetCommand },
- { "identify", WidgetIdentifyCommand },
- { "instate", WidgetInstateCommand },
- { "state", WidgetStateCommand },
+ { "configure", TtkWidgetConfigureCommand },
+ { "cget", TtkWidgetCgetCommand },
+ { "identify", TtkWidgetIdentifyCommand },
+ { "instate", TtkWidgetInstateCommand },
+ { "state", TtkWidgetStateCommand },
{ NULL, NULL }
};
/*
* Widget specification:
*/
-WidgetSpec SeparatorWidgetSpec =
+MODULE_SCOPE WidgetSpec ttkSeparatorWidgetSpec;
+WidgetSpec ttkSeparatorWidgetSpec =
{
"TSeparator", /* className */
sizeof(Separator), /* recordSize */
SeparatorOptionSpecs, /* optionSpecs */
SeparatorCommands, /* subcommands */
- NullInitialize, /* initializeProc */
- NullCleanup, /* cleanupProc */
- CoreConfigure, /* configureProc */
- NullPostConfigure, /* postConfigureProc */
+ TtkNullInitialize, /* initializeProc */
+ TtkNullCleanup, /* cleanupProc */
+ TtkCoreConfigure, /* configureProc */
+ TtkNullPostConfigure, /* postConfigureProc */
SeparatorGetLayout, /* getLayoutProc */
- WidgetSize, /* sizeProc */
- WidgetDoLayout, /* layoutProc */
- WidgetDisplay /* displayProc */
+ TtkWidgetSize, /* sizeProc */
+ TtkWidgetDoLayout, /* layoutProc */
+ TtkWidgetDisplay /* displayProc */
};
/* +++ Sizegrip widget:
@@ -84,28 +85,29 @@ WidgetSpec SeparatorWidgetSpec =
static WidgetCommandSpec SizegripCommands[] =
{
- { "configure", WidgetConfigureCommand },
- { "cget", WidgetCgetCommand },
- { "identify", WidgetIdentifyCommand },
- { "instate", WidgetInstateCommand },
- { "state", WidgetStateCommand },
+ { "configure", TtkWidgetConfigureCommand },
+ { "cget", TtkWidgetCgetCommand },
+ { "identify", TtkWidgetIdentifyCommand },
+ { "instate", TtkWidgetInstateCommand },
+ { "state", TtkWidgetStateCommand },
{ NULL, NULL }
};
-WidgetSpec SizegripWidgetSpec =
+MODULE_SCOPE WidgetSpec ttkSizegripWidgetSpec;
+WidgetSpec ttkSizegripWidgetSpec =
{
"TSizegrip", /* className */
sizeof(WidgetCore), /* recordSize */
- CoreOptionSpecs, /* optionSpecs */
+ ttkCoreOptionSpecs, /* optionSpecs */
SizegripCommands, /* subcommands */
- NullInitialize, /* initializeProc */
- NullCleanup, /* cleanupProc */
- CoreConfigure, /* configureProc */
- NullPostConfigure, /* postConfigureProc */
- WidgetGetLayout, /* getLayoutProc */
- WidgetSize, /* sizeProc */
- WidgetDoLayout, /* layoutProc */
- WidgetDisplay /* displayProc */
+ TtkNullInitialize, /* initializeProc */
+ TtkNullCleanup, /* cleanupProc */
+ TtkCoreConfigure, /* configureProc */
+ TtkNullPostConfigure, /* postConfigureProc */
+ TtkWidgetGetLayout, /* getLayoutProc */
+ TtkWidgetSize, /* sizeProc */
+ TtkWidgetDoLayout, /* layoutProc */
+ TtkWidgetDisplay /* displayProc */
};
/*EOF*/