Internal Ttk_Manager API updates (missed from 2007-11-25 commit)

2 files changed, 24 insertions, 19 deletions

diff --git a/generic/ttk/ttkManager.h b/generic/ttk/ttkManager.h
index 7d3ac6e..4c33a15 100644
--- a/generic/ttk/ttkManager.h
+++ b/generic/ttk/ttkManager.h
@@ -1,4 +1,4 @@
-/* $Id: ttkManager.h,v 1.7 2007/11/25 18:11:12 jenglish Exp $
+/* $Id: ttkManager.h,v 1.8 2007/12/02 02:50:07 jenglish Exp $
  *
  * Copyright (c) 2005, Joe English.  Freely redistributable.
  *
@@ -81,9 +81,6 @@ MODULE_SCOPE int Ttk_GetSlaveIndexFromObj(
 MODULE_SCOPE int Ttk_NumberSlaves(Ttk_Manager *);
     /* Returns: number of managed slaves */
 
-MODULE_SCOPE void *Ttk_ManagerData(Ttk_Manager *);
-    /* Returns: client data associated with master */
-
 MODULE_SCOPE void *Ttk_SlaveData(Ttk_Manager *, int slaveIndex);
     /* Returns: client data associated with slave */
 
diff --git a/generic/ttk/ttkWidget.h b/generic/ttk/ttkWidget.h
index 2049323..289faae 100644
--- a/generic/ttk/ttkWidget.h
+++ b/generic/ttk/ttkWidget.h
@@ -1,4 +1,4 @@
-/* $Id: ttkWidget.h,v 1.6 2007/01/11 14:49:47 jenglish Exp $
+/* $Id: ttkWidget.h,v 1.7 2007/12/02 02:50:07 jenglish Exp $
  * Copyright (c) 2003, Joe English
  * Helper routines for widget implementations.
  */
@@ -6,7 +6,8 @@
 #ifndef _TTKWIDGET
 #define _TTKWIDGET
 
-/* State flags for 'flags' field.
+/*
+ * State flags for 'flags' field.
  */
 #define WIDGET_DESTROYED	0x0001
 #define REDISPLAY_PENDING 	0x0002	/* scheduled call to RedisplayWidget */
@@ -91,27 +92,33 @@ struct WidgetSpec_
 MODULE_SCOPE int  TtkNullInitialize(Tcl_Interp *, void *);
 MODULE_SCOPE int  TtkNullPostConfigure(Tcl_Interp *, void *, int);
 MODULE_SCOPE void TtkNullCleanup(void *recordPtr);
-MODULE_SCOPE Ttk_Layout TtkWidgetGetLayout(Tcl_Interp *, Ttk_Theme, void *recordPtr);
+MODULE_SCOPE Ttk_Layout TtkWidgetGetLayout(
+	Tcl_Interp *, Ttk_Theme, void *recordPtr);
 MODULE_SCOPE Ttk_Layout TtkWidgetGetOrientedLayout(
-    Tcl_Interp *, Ttk_Theme, void *recordPtr, Tcl_Obj *orientObj);
+	Tcl_Interp *, Ttk_Theme, void *recordPtr, Tcl_Obj *orientObj);
 MODULE_SCOPE int  TtkWidgetSize(void *recordPtr, int *w, int *h);
 MODULE_SCOPE void TtkWidgetDoLayout(void *recordPtr);
 MODULE_SCOPE void TtkWidgetDisplay(void *recordPtr, Drawable);
 
 MODULE_SCOPE int TtkCoreConfigure(Tcl_Interp*, void *, int mask);
 
-/* Commands present in all widgets:
- */
-MODULE_SCOPE int TtkWidgetConfigureCommand(Tcl_Interp *, int, Tcl_Obj*const[], void *);
-MODULE_SCOPE int TtkWidgetCgetCommand(Tcl_Interp *, int, Tcl_Obj*const[], void *);
-MODULE_SCOPE int TtkWidgetInstateCommand(Tcl_Interp *, int, Tcl_Obj*const[], void *);
-MODULE_SCOPE int TtkWidgetStateCommand(Tcl_Interp *, int, Tcl_Obj*const[], void *);
-
 /* Common widget commands:
  */
-MODULE_SCOPE int TtkWidgetIdentifyCommand(Tcl_Interp *, int, Tcl_Obj*const[], void *);
-
-MODULE_SCOPE int TtkWidgetConstructorObjCmd(ClientData,Tcl_Interp*,int,Tcl_Obj*CONST[]);
+MODULE_SCOPE int TtkWidgetConfigureCommand(
+	Tcl_Interp *, int, Tcl_Obj*const[], void *);
+MODULE_SCOPE int TtkWidgetCgetCommand(
+	Tcl_Interp *, int, Tcl_Obj*const[], void *);
+MODULE_SCOPE int TtkWidgetInstateCommand(
+	Tcl_Interp *, int, Tcl_Obj*const[], void *);
+MODULE_SCOPE int TtkWidgetStateCommand(
+	Tcl_Interp *, int, Tcl_Obj*const[], void *);
+MODULE_SCOPE int TtkWidgetIdentifyCommand(
+	Tcl_Interp *, int, Tcl_Obj*const[], void *);
+
+/* Widget constructor:
+ */
+MODULE_SCOPE int TtkWidgetConstructorObjCmd(
+	ClientData, Tcl_Interp*, int, Tcl_Obj*const[]);
 
 #define RegisterWidget(interp, name, specPtr) \
     Tcl_CreateObjCommand(interp, name, \
@@ -236,7 +243,8 @@ MODULE_SCOPE const char *ttkDefaultStrings[];
 /*
  * ... other option types...
  */
-MODULE_SCOPE int TtkGetLabelAnchorFromObj(Tcl_Interp*,Tcl_Obj*,Ttk_PositionSpec *);
+MODULE_SCOPE int TtkGetLabelAnchorFromObj(
+	Tcl_Interp*, Tcl_Obj*, Ttk_PositionSpec *);
 
 /*
  * Platform-specific initialization.