* 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.

1 files changed, 22 insertions, 21 deletions

diff --git a/generic/ttk/ttkElements.c b/generic/ttk/ttkElements.c
index 8cd5c6b..787ea64 100644
--- a/generic/ttk/ttkElements.c
+++ b/generic/ttk/ttkElements.c
@@ -1,4 +1,4 @@
-/* $Id: ttkElements.c,v 1.1 2006/10/31 01:42:26 hobbs Exp $
+/* $Id: ttkElements.c,v 1.2 2006/11/03 03:06:22 das Exp $
  *
  * Copyright (c) 2003, Joe English
  *
@@ -10,6 +10,7 @@
 #include <tk.h>
 #include <string.h>
 #include "ttkTheme.h"
+#include "ttkWidget.h"
 
 #define DEFAULT_BORDERWIDTH "2"
 #define DEFAULT_ARROW_SIZE "15"
@@ -21,29 +22,29 @@
  * and may be used in other engines.
  */
 
-/* public */ Ttk_ElementOptionSpec NullElementOptions[] = { {NULL} };
+/* public */ Ttk_ElementOptionSpec TtkNullElementOptions[] = { {NULL} };
 
 /* public */ void
-NullElementGeometry(
+TtkNullElementGeometry(
     void *clientData, void *elementRecord, Tk_Window tkwin,
     int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr)
 {
 }
 
 /* public */ void
-NullElementDraw(
+TtkNullElementDraw(
     void *clientData, void *elementRecord, Tk_Window tkwin,
     Drawable d, Ttk_Box b, unsigned int state)
 {
 }
 
-/* public */ Ttk_ElementSpec NullElementSpec =
+/* public */ Ttk_ElementSpec ttkNullElementSpec =
 {
     TK_STYLE_VERSION_2,
     sizeof(NullElement),
-    NullElementOptions,
-    NullElementGeometry,
-    NullElementDraw
+    TtkNullElementOptions,
+    TtkNullElementGeometry,
+    TtkNullElementDraw
 };
 
 /*----------------------------------------------------------------------
@@ -767,7 +768,7 @@ ArrowElementGeometry(
 
     Tk_GetPixelsFromObj(NULL, tkwin, arrow->sizeObj, &width);
     width -= Ttk_PaddingWidth(ArrowPadding);
-    ArrowSize(width/2, direction, widthPtr, heightPtr);
+    TtkArrowSize(width/2, direction, widthPtr, heightPtr);
     *paddingPtr = ArrowPadding;
 }
 
@@ -788,7 +789,7 @@ ArrowElementDraw(
     Tk_Fill3DRectangle(
 	tkwin, d, border, b.x, b.y, b.width, b.height, borderWidth, relief);
 
-    FillArrow(Tk_Display(tkwin), d, Tk_GCForColor(arrowColor, d),
+    TtkFillArrow(Tk_Display(tkwin), d, Tk_GCForColor(arrowColor, d),
 	Ttk_PadBox(b, ArrowPadding), direction);
 }
 
@@ -1357,17 +1358,17 @@ TTK_BEGIN_LAYOUT(SizegripLayout)
 TTK_END_LAYOUT
 
 /*----------------------------------------------------------------------
- * RegisterElements --
+ * TtkRegisterElements --
  *
  *	Register all elements and layouts defined in this package.
  */
 
-extern Ttk_ElementSpec TextElementSpec;
-extern Ttk_ElementSpec ImageElementSpec;
-extern Ttk_ElementSpec ImageTextElementSpec;
-extern Ttk_ElementSpec LabelElementSpec;
+extern Ttk_ElementSpec ttkTextElementSpec;
+extern Ttk_ElementSpec ttkImageElementSpec;
+extern Ttk_ElementSpec ttkImageTextElementSpec;
+extern Ttk_ElementSpec ttkLabelElementSpec;
 
-void RegisterElements(Tcl_Interp *interp)
+void TtkRegisterElements(Tcl_Interp *interp)
 {
     Ttk_Theme theme =  Ttk_GetDefaultTheme(interp);
 
@@ -1382,11 +1383,11 @@ void RegisterElements(Tcl_Interp *interp)
     Ttk_RegisterElement(interp, theme, "focus", &FocusElementSpec, NULL);
 
     Ttk_RegisterElement(interp, theme, "padding", &PaddingElementSpec, NULL);
-    Ttk_RegisterElement(interp, theme, "text", &TextElementSpec, NULL);
+    Ttk_RegisterElement(interp, theme, "text", &ttkTextElementSpec, NULL);
     Ttk_RegisterElement(interp, theme,
-	    "Labelframe.text",&ImageTextElementSpec,NULL);
-    Ttk_RegisterElement(interp, theme, "image", &ImageElementSpec, interp);
-    Ttk_RegisterElement(interp, theme, "label", &LabelElementSpec, interp);
+	    "Labelframe.text",&ttkImageTextElementSpec,NULL);
+    Ttk_RegisterElement(interp, theme, "image", &ttkImageElementSpec, interp);
+    Ttk_RegisterElement(interp, theme, "label", &ttkLabelElementSpec, interp);
     Ttk_RegisterElement(interp, theme, "Checkbutton.indicator",
 	    &CheckbuttonIndicatorElementSpec, NULL);
     Ttk_RegisterElement(interp, theme, "Radiobutton.indicator",
@@ -1394,7 +1395,7 @@ void RegisterElements(Tcl_Interp *interp)
     Ttk_RegisterElement(interp, theme, "Menubutton.indicator",
 	    &MenuIndicatorElementSpec, NULL);
 
-    Ttk_RegisterElement(interp, theme, "indicator", &NullElementSpec,NULL);
+    Ttk_RegisterElement(interp, theme, "indicator", &ttkNullElementSpec,NULL);
 
     Ttk_RegisterElement(interp, theme, "uparrow",
 	    &ArrowElementSpec, &ArrowElements[0]);