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

3 files changed, 19 insertions, 19 deletions

diff --git a/win/ttkWinMonitor.c b/win/ttkWinMonitor.c
index b13c36d..345eed9 100644
--- a/win/ttkWinMonitor.c
+++ b/win/ttkWinMonitor.c
@@ -1,4 +1,4 @@
-/* $Id: ttkWinMonitor.c,v 1.1 2006/10/31 01:42:28 hobbs Exp $
+/* $Id: ttkWinMonitor.c,v 1.2 2006/11/03 03:06:22 das Exp $
  */
 
 #ifdef _MSC_VER
@@ -146,10 +146,10 @@ WndProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp)
  * Windows-specific platform initialization:
  */
 
-extern int WinTheme_Init(Tcl_Interp *, HWND hwnd);
-extern int XPTheme_Init(Tcl_Interp *, HWND hwnd);
+extern int TtkWinTheme_Init(Tcl_Interp *, HWND hwnd);
+extern int TtkXPTheme_Init(Tcl_Interp *, HWND hwnd);
 
-int Ttk_WinPlatformInit(Tcl_Interp *interp)
+MODULE_SCOPE int Ttk_WinPlatformInit(Tcl_Interp *interp)
 {
     HWND hwnd;
     
diff --git a/win/ttkWinTheme.c b/win/ttkWinTheme.c
index eb3a9eb..73010f3 100644
--- a/win/ttkWinTheme.c
+++ b/win/ttkWinTheme.c
@@ -1,6 +1,6 @@
 /* winTheme.c - Copyright (C) 2004 Pat Thoyts <patthoyts@users.sf.net>
  *
- * $Id: ttkWinTheme.c,v 1.1 2006/10/31 01:42:28 hobbs Exp $
+ * $Id: ttkWinTheme.c,v 1.2 2006/11/03 03:06:22 das Exp $
  */
 
 #ifdef _MSC_VER
@@ -155,7 +155,7 @@ static Ttk_ElementSpec FrameControlElementSpec =
 {
     TK_STYLE_VERSION_2,
     sizeof(NullElement),
-    NullElementOptions,
+    TtkNullElementOptions,
     FrameControlElementGeometry,
     FrameControlElementDraw
 };
@@ -392,7 +392,7 @@ static Ttk_ElementSpec FocusElementSpec =
 {
     TK_STYLE_VERSION_2,
     sizeof(NullElement),
-    NullElementOptions,
+    TtkNullElementOptions,
     FocusElementGeometry,
     FocusElementDraw
 };
@@ -519,8 +519,8 @@ static Ttk_ElementSpec TroughElementSpec =
 {
     TK_STYLE_VERSION_2,
     sizeof(NullElement),
-    NullElementOptions,
-    NullElementGeometry,
+    TtkNullElementOptions,
+    TtkNullElementGeometry,
     TroughElementDraw
 };
 
@@ -665,7 +665,7 @@ static Ttk_ElementSpec ClientElementSpec =
 {
     TK_STYLE_VERSION_2,
     sizeof(NullElement),
-    NullElementOptions,
+    TtkNullElementOptions,
     ClientElementGeometry,
     ClientElementDraw
 };
@@ -691,7 +691,7 @@ TTK_END_LAYOUT
 
 /* ---------------------------------------------------------------------- */
 
-int WinTheme_Init(Tcl_Interp *interp, HWND hwnd)
+MODULE_SCOPE int TtkWinTheme_Init(Tcl_Interp *interp, HWND hwnd)
 {
     Ttk_Theme themePtr, parentPtr;
     FrameControlElementData *fce = FrameControlElements;
diff --git a/win/ttkWinXPTheme.c b/win/ttkWinXPTheme.c
index 107aa55..d8748c0 100644
--- a/win/ttkWinXPTheme.c
+++ b/win/ttkWinXPTheme.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ttkWinXPTheme.c,v 1.1 2006/10/31 01:42:28 hobbs Exp $
+ * $Id: ttkWinXPTheme.c,v 1.2 2006/11/03 03:06:22 das Exp $
  *
  * Tk theme engine which uses the Windows XP "Visual Styles" API
  * Adapted from Georgios Petasis' XP theme patch.
@@ -535,7 +535,7 @@ static Ttk_ElementSpec GenericElementSpec =
 {
     TK_STYLE_VERSION_2,
     sizeof(NullElement),
-    NullElementOptions,
+    TtkNullElementOptions,
     GenericElementGeometry,
     GenericElementDraw
 };
@@ -574,7 +574,7 @@ static Ttk_ElementSpec ThumbElementSpec =
 {
     TK_STYLE_VERSION_2,
     sizeof(NullElement),
-    NullElementOptions,
+    TtkNullElementOptions,
     GenericElementGeometry,
     ThumbElementDraw
 };
@@ -606,7 +606,7 @@ static Ttk_ElementSpec PbarElementSpec =
 {
     TK_STYLE_VERSION_2,
     sizeof(NullElement),
-    NullElementOptions,
+    TtkNullElementOptions,
     PbarElementGeometry,
     GenericElementDraw
 };
@@ -647,7 +647,7 @@ static Ttk_ElementSpec TabElementSpec =
 {
     TK_STYLE_VERSION_2,
     sizeof(NullElement),
-    NullElementOptions,
+    TtkNullElementOptions,
     GenericElementGeometry,
     TabElementDraw
 };
@@ -687,7 +687,7 @@ static Ttk_ElementSpec TreeIndicatorElementSpec =
 {
     TK_STYLE_VERSION_2,
     sizeof(NullElement),
-    NullElementOptions,
+    TtkNullElementOptions,
     GenericElementGeometry,
     TreeIndicatorElementDraw
 };
@@ -933,7 +933,7 @@ static ElementInfo ElementInfoTable[] = {
  * +++ Initialization routine:
  */
 
-int XPTheme_Init(Tcl_Interp *interp, HWND hwnd)
+MODULE_SCOPE int TtkXPTheme_Init(Tcl_Interp *interp, HWND hwnd)
 {
     XPThemeData *themeData;
     XPThemeProcs *procs;
@@ -976,7 +976,7 @@ int XPTheme_Init(Tcl_Interp *interp, HWND hwnd)
 	Ttk_RegisterCleanup(interp, clientData, DestroyElementData);
     }
 
-    Ttk_RegisterElementSpec(themePtr, "Scale.trough", &NullElementSpec, 0);
+    Ttk_RegisterElementSpec(themePtr, "Scale.trough", &ttkNullElementSpec, 0);
 
     /*
      * Layouts: