summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorjoye <joye>2015-06-03 17:13:35 (GMT)
committerjoye <joye>2015-06-03 17:13:35 (GMT)
commit21e1ad7a4862c286489bb4e34bc4efd4b1e0b2cc (patch)
treee7b586475738c91c4a386ff6bd8d41fafa644c91 /src
parent41f8670cced42649a45c0d89c1dd7a3607b811f4 (diff)
downloadblt-21e1ad7a4862c286489bb4e34bc4efd4b1e0b2cc.zip
blt-21e1ad7a4862c286489bb4e34bc4efd4b1e0b2cc.tar.gz
blt-21e1ad7a4862c286489bb4e34bc4efd4b1e0b2cc.tar.bz2
*** empty log message ***
Diffstat (limited to 'src')
-rw-r--r--src/bltGrElemBar.h2
-rw-r--r--src/bltInt.C25
2 files changed, 4 insertions, 23 deletions
diff --git a/src/bltGrElemBar.h b/src/bltGrElemBar.h
index 3fa0c63..38eefa6 100644
--- a/src/bltGrElemBar.h
+++ b/src/bltGrElemBar.h
@@ -31,9 +31,7 @@
#define __BltGrElemBar_h__
#include <tk.h>
-#ifdef USE_TK_STUBS
#include <tkInt.h>
-#endif
#include "bltGrElem.h"
#include "bltGrPenBar.h"
diff --git a/src/bltInt.C b/src/bltInt.C
index e1c0623..e881bd1 100644
--- a/src/bltInt.C
+++ b/src/bltInt.C
@@ -41,32 +41,16 @@ int Tkblt_Init(Tcl_Interp* interp)
{
Tcl_Namespace *nsPtr;
- if(
-#ifdef USE_TCL_STUBS
- Tcl_InitStubs(interp, TCL_PATCH_LEVEL, 0)
-#else
- Tcl_PkgRequire(interp, "Tcl", TCL_PATCH_LEVEL, 0)
-#endif
- == NULL) {
+ if (Tcl_InitStubs(interp, TCL_PATCH_LEVEL, 0) == NULL)
return TCL_ERROR;
- }
-
- if(
-#ifdef USE_TK_STUBS
- Tk_InitStubs(interp, TK_PATCH_LEVEL, 0)
-#else
- Tcl_PkgRequire(interp, "Tk", TK_PATCH_LEVEL, 0)
-#endif
- == NULL) {
+ if (Tk_InitStubs(interp, TK_PATCH_LEVEL, 0) == NULL)
return TCL_ERROR;
- }
nsPtr = Tcl_FindNamespace(interp, "::blt", (Tcl_Namespace *)NULL, 0);
if (nsPtr == NULL) {
nsPtr = Tcl_CreateNamespace(interp, "::blt", NULL, NULL);
- if (nsPtr == NULL) {
+ if (nsPtr == NULL)
return TCL_ERROR;
- }
}
if (Blt_VectorCmdInitProc(interp) != TCL_OK)
@@ -74,9 +58,8 @@ int Tkblt_Init(Tcl_Interp* interp)
if (Blt_GraphCmdInitProc(interp) != TCL_OK)
return TCL_ERROR;
- if (Tcl_PkgProvide(interp, PACKAGE_NAME, PACKAGE_VERSION) != TCL_OK) {
+ if (Tcl_PkgProvide(interp, PACKAGE_NAME, PACKAGE_VERSION) != TCL_OK)
return TCL_ERROR;
- }
return TCL_OK;
}