summaryrefslogtreecommitdiffstats
path: root/generic/ttk/ttkPanedwindow.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/ttkPanedwindow.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/ttkPanedwindow.c')
-rw-r--r--generic/ttk/ttkPanedwindow.c36
1 files changed, 19 insertions, 17 deletions
diff --git a/generic/ttk/ttkPanedwindow.c b/generic/ttk/ttkPanedwindow.c
index 8b55e50..7fe1cc8 100644
--- a/generic/ttk/ttkPanedwindow.c
+++ b/generic/ttk/ttkPanedwindow.c
@@ -1,4 +1,4 @@
-/* $Id: ttkPanedwindow.c,v 1.1 2006/10/31 01:42:26 hobbs Exp $
+/* $Id: ttkPanedwindow.c,v 1.2 2006/11/03 03:06:22 das Exp $
*
* Copyright (c) 2005, Joe English. Freely redistributable.
*
@@ -78,9 +78,9 @@ typedef struct {
static Tk_OptionSpec PanedOptionSpecs[] = {
{TK_OPTION_STRING_TABLE, "-orient", "orient", "Orient", "vertical",
Tk_Offset(Paned,paned.orientObj), Tk_Offset(Paned,paned.orient),
- 0,(ClientData)TTKOrientStrings,READONLY_OPTION|STYLE_CHANGED },
+ 0,(ClientData)ttkOrientStrings,READONLY_OPTION|STYLE_CHANGED },
- WIDGET_INHERIT_OPTIONS(CoreOptionSpecs)
+ WIDGET_INHERIT_OPTIONS(ttkCoreOptionSpecs)
};
/*------------------------------------------------------------------------
@@ -406,7 +406,7 @@ static void PanedEventProc(ClientData clientData, XEvent *eventPtr)
if ( eventPtr->type == LeaveNotify
&& eventPtr->xcrossing.detail == NotifyInferior)
{
- SendVirtualEvent(corePtr->tkwin, "EnteredChild");
+ TtkSendVirtualEvent(corePtr->tkwin, "EnteredChild");
}
}
@@ -445,7 +445,7 @@ static Ttk_Layout PanedGetLayout(
Tcl_Interp *interp, Ttk_Theme themePtr, void *recordPtr)
{
Paned *pw = recordPtr;
- Ttk_Layout panedLayout = WidgetGetLayout(interp, themePtr, recordPtr);
+ Ttk_Layout panedLayout = TtkWidgetGetLayout(interp, themePtr, recordPtr);
int horizontal = pw->paned.orient == TTK_ORIENT_HORIZONTAL;
const char *layoutName = horizontal ? ".Vertical.Sash" : ".Horizontal.Sash";
Ttk_Layout sashLayout = Ttk_CreateSublayout(interp, themePtr, panedLayout,
@@ -483,7 +483,7 @@ static void PanedDisplay(void *recordPtr, Drawable d)
int nPanes = Ttk_NumberSlaves(pw->paned.mgr);
int i;
- WidgetDisplay(recordPtr, d);
+ TtkWidgetDisplay(recordPtr, d);
/* Draw sashes:
*/
@@ -652,10 +652,10 @@ static int PanedPaneCommand(
switch (objc) {
case 3:
- return EnumerateOptions(interp, slave->slaveData, PaneOptionSpecs,
+ return TtkEnumerateOptions(interp, slave->slaveData, PaneOptionSpecs,
pw->paned.mgr->slaveOptionTable, slave->slaveWindow);
case 4:
- return GetOptionValue(interp, slave->slaveData,objv[3],
+ return TtkGetOptionValue(interp, slave->slaveData,objv[3],
pw->paned.mgr->slaveOptionTable, slave->slaveWindow);
default:
return Ttk_ConfigureSlave(
@@ -715,15 +715,15 @@ static int PanedSashposCommand(
static WidgetCommandSpec PanedCommands[] =
{
{ "add", PanedAddCommand },
- { "configure", WidgetConfigureCommand },
- { "cget", WidgetCgetCommand },
+ { "configure", TtkWidgetConfigureCommand },
+ { "cget", TtkWidgetCgetCommand },
{ "forget", PanedForgetCommand },
{ "identify", PanedIdentifyCommand },
{ "insert", PanedInsertCommand },
- { "instate", WidgetInstateCommand },
+ { "instate", TtkWidgetInstateCommand },
{ "pane", PanedPaneCommand },
{ "sashpos", PanedSashposCommand },
- { "state", WidgetStateCommand },
+ { "state", TtkWidgetStateCommand },
{ 0,0 }
};
@@ -739,11 +739,11 @@ static WidgetSpec PanedWidgetSpec =
PanedCommands, /* subcommands */
PanedInitialize, /* initializeProc */
PanedCleanup, /* cleanupProc */
- CoreConfigure, /* configureProc */
- NullPostConfigure, /* postConfigureProc */
+ TtkCoreConfigure, /* configureProc */
+ TtkNullPostConfigure, /* postConfigureProc */
PanedGetLayout, /* getLayoutProc */
PanedSize, /* sizeProc */
- WidgetDoLayout, /* layoutProc */
+ TtkWidgetDoLayout, /* layoutProc */
PanedDisplay /* displayProc */
};
@@ -776,7 +776,7 @@ static Ttk_ElementSpec SashElementSpec = {
sizeof(SashElement),
SashElementOptions,
SashElementSize,
- NullElementDraw
+ TtkNullElementDraw
};
TTK_BEGIN_LAYOUT(PanedLayout)
@@ -794,7 +794,7 @@ TTK_END_LAYOUT
/*------------------------------------------------------------------------
* +++ Registration routine.
*/
-void Paned_Init(Tcl_Interp *interp)
+MODULE_SCOPE int TtkPaned_Init(Tcl_Interp *interp)
{
Ttk_Theme themePtr = Ttk_GetDefaultTheme(interp);
RegisterWidget(interp, "ttk::panedwindow", &PanedWidgetSpec);
@@ -805,5 +805,7 @@ void Paned_Init(Tcl_Interp *interp)
Ttk_RegisterLayout(themePtr, "TPanedwindow", PanedLayout);
Ttk_RegisterLayout(themePtr, "Horizontal.Sash", HorizontalSashLayout);
Ttk_RegisterLayout(themePtr, "Vertical.Sash", VerticalSashLayout);
+
+ return TCL_OK;
}