Eliminate usage of Tcl_PkgProvide/Tcl_PkgRequire functions, use the 'Ex' versions in stead.

10 files changed, 12 insertions, 12 deletions

diff --git a/generic/tkTest.c b/generic/tkTest.c
index ca0aa6a..0fd7d9b 100644
--- a/generic/tkTest.c
+++ b/generic/tkTest.c
@@ -231,7 +231,7 @@ Tktest_Init(
      * Create additional commands for testing Tk.
      */
 
-    if (Tcl_PkgProvide(interp, "Tktest", TK_VERSION) == TCL_ERROR) {
+    if (Tcl_PkgProvideEx(interp, "Tktest", TK_VERSION, NULL) == TCL_ERROR) {
         return TCL_ERROR;
     }
 
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index 10ae820..d20473f 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.c
@@ -3391,7 +3391,7 @@ Tk_PkgInitStubsCheck(
     const char * version,
     int exact)
 {
-    const char *actualVersion = Tcl_PkgRequire(interp, "Tk", version, 0);
+    const char *actualVersion = Tcl_PkgRequireEx(interp, "Tk", version, 0, NULL);
 
     if (exact && actualVersion) {
 	const char *p = version;
@@ -3403,11 +3403,11 @@ Tk_PkgInitStubsCheck(
 	if (count == 1) {
 	    if (0 != strncmp(version, actualVersion, strlen(version))) {
 		/* Construct error message */
-		Tcl_PkgPresent(interp, "Tk", version, 1);
+		Tcl_PkgPresentEx(interp, "Tk", version, 1, NULL);
 		return NULL;
 	    }
 	} else {
-	    return Tcl_PkgPresent(interp, "Tk", version, 1);
+	    return Tcl_PkgPresentEx(interp, "Tk", version, 1, NULL);
 	}
     }
     return actualVersion;
diff --git a/generic/ttk/ttkClamTheme.c b/generic/ttk/ttkClamTheme.c
index 572f630..fc4f712 100644
--- a/generic/ttk/ttkClamTheme.c
+++ b/generic/ttk/ttkClamTheme.c
@@ -965,7 +965,7 @@ TtkClamTheme_Init(Tcl_Interp *interp)
 
     Ttk_RegisterLayouts(theme, LayoutTable);
 
-    Tcl_PkgProvide(interp, "ttk::theme::clam", TTK_VERSION);
+    Tcl_PkgProvideEx(interp, "ttk::theme::clam", TTK_VERSION, NULL);
 
     return TCL_OK;
 }
diff --git a/generic/ttk/ttkClassicTheme.c b/generic/ttk/ttkClassicTheme.c
index 2fbcd76..e23ecb3 100644
--- a/generic/ttk/ttkClassicTheme.c
+++ b/generic/ttk/ttkClassicTheme.c
@@ -505,7 +505,7 @@ MODULE_SCOPE int TtkClassicTheme_Init(Tcl_Interp *interp)
      */
     Ttk_RegisterLayouts(theme, LayoutTable);
 
-    Tcl_PkgProvide(interp, "ttk::theme::classic", TTK_VERSION);
+    Tcl_PkgProvideEx(interp, "ttk::theme::classic", TTK_VERSION, NULL);
 
     return TCL_OK;
 }
diff --git a/generic/ttk/ttkDecls.h b/generic/ttk/ttkDecls.h
index b7c8de4..5f7cb0c 100644
--- a/generic/ttk/ttkDecls.h
+++ b/generic/ttk/ttkDecls.h
@@ -13,7 +13,7 @@ extern const char *TtkInitializeStubs(
 	interp, TTK_VERSION, TTK_STUBS_EPOCH, TTK_STUBS_REVISION)
 #else
 
-#define Ttk_InitStubs(interp) Tcl_PkgRequire(interp, "Ttk", TTK_VERSION, 0)
+#define Ttk_InitStubs(interp) Tcl_PkgRequireEx(interp, "Ttk", TTK_VERSION, 0, NULL)
 
 #endif
 
diff --git a/generic/ttk/ttkDefaultTheme.c b/generic/ttk/ttkDefaultTheme.c
index 0c55651..9f7e621 100644
--- a/generic/ttk/ttkDefaultTheme.c
+++ b/generic/ttk/ttkDefaultTheme.c
@@ -1122,7 +1122,7 @@ MODULE_SCOPE int TtkAltTheme_Init(Tcl_Interp *interp)
     Ttk_RegisterElement(interp, theme, "Treeitem.indicator",
 	    &TreeitemIndicatorElementSpec, 0);
 
-    Tcl_PkgProvide(interp, "ttk::theme::alt", TTK_VERSION);
+    Tcl_PkgProvideEx(interp, "ttk::theme::alt", TTK_VERSION, NULL);
 
     return TCL_OK;
 }
diff --git a/generic/ttk/ttkElements.c b/generic/ttk/ttkElements.c
index 22af1d6..c348834 100644
--- a/generic/ttk/ttkElements.c
+++ b/generic/ttk/ttkElements.c
@@ -1275,7 +1275,7 @@ void TtkElements_Init(Tcl_Interp *interp)
     /*
      * Register "default" as a user-loadable theme (for now):
      */
-    Tcl_PkgProvide(interp, "ttk::theme::default", TTK_VERSION);
+    Tcl_PkgProvideEx(interp, "ttk::theme::default", TTK_VERSION, NULL);
 }
 
 /*EOF*/
diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c
index 5752fb1..b5a0adc 100644
--- a/macosx/ttkMacOSXTheme.c
+++ b/macosx/ttkMacOSXTheme.c
@@ -1182,7 +1182,7 @@ static int AquaTheme_Init(Tcl_Interp *interp)
      */
     Ttk_RegisterLayouts(themePtr, LayoutTable);
 
-    Tcl_PkgProvide(interp, "ttk::theme::aqua", TTK_VERSION);
+    Tcl_PkgProvideEx(interp, "ttk::theme::aqua", TTK_VERSION, NULL);
     return TCL_OK;
 }
 
diff --git a/win/ttkWinTheme.c b/win/ttkWinTheme.c
index 63e9704..569d445 100644
--- a/win/ttkWinTheme.c
+++ b/win/ttkWinTheme.c
@@ -727,7 +727,7 @@ int TtkWinTheme_Init(Tcl_Interp *interp, HWND hwnd)
 
     Ttk_RegisterLayouts(themePtr, LayoutTable);
 
-    Tcl_PkgProvide(interp, "ttk::theme::winnative", TTK_VERSION);
+    Tcl_PkgProvideEx(interp, "ttk::theme::winnative", TTK_VERSION, NULL);
     return TCL_OK;
 }
 
diff --git a/win/ttkWinXPTheme.c b/win/ttkWinXPTheme.c
index 1a5e934..435282d 100644
--- a/win/ttkWinXPTheme.c
+++ b/win/ttkWinXPTheme.c
@@ -1319,7 +1319,7 @@ MODULE_SCOPE int TtkXPTheme_Init(Tcl_Interp *interp, HWND hwnd)
      */
     Ttk_RegisterLayouts(themePtr, LayoutTable);
 
-    Tcl_PkgProvide(interp, "ttk::theme::xpnative", TTK_VERSION);
+    Tcl_PkgProvideEx(interp, "ttk::theme::xpnative", TTK_VERSION, NULL);
 
     return TCL_OK;
 }