Correcting gtkTtk_Symbols generation.

Author: Geballin

generic/gtkTtk_Symbols.cpp

@@ -2,7 +2,7 @@
  *  gtkTtk_Symbols.cpp
  * ------------------------
  *
- * This file is part of the gtkTtk package, a Tk/Tile based theme that uses
+ * This file is part of the GtkTtk package, a ttk based theme that uses
  * Gtk/GNOME for drawing.
  *
  * Copyright (C) 2004-2012 by:

generic/gtkTtk_Symbols.h

@@ -2,7 +2,7 @@
  *  gtkTtk_Symbols.h
  * --------------------
  *
- * This file is part of the gtkTtk package, a Tk/Tile based theme that uses
+ * This file is part of the GtkTtk package, a ttk based theme that uses
  * Gtk/GNOME for drawing.
  *
  * Copyright (C) 2004-2012 by:

library/GenarateSymbols.tcl

@@ -340,21 +340,21 @@ set sources [file dirname $HomeDir]/generic
 ## Force the following symbols to exist!
 ##
 foreach s {g_malloc0 g_malloc} {
-  set Symbols(TileGtk_$s) 1
+  set Symbols(GtkTtk_$s) 1
 }
 
 proc process {data} {
   global Symbols
   set skip {[^)(\",=]+}
   foreach lib {gtk gdk xlib g} {
-    foreach s [regexp -inline -all "TileGtk_${lib}_${skip}\\\s*\\\(" $data] {
+    foreach s [regexp -inline -all "GtkTtk_${lib}_${skip}\\\s*\\\(" $data] {
       set Symbols([string trim $s { ()}]) 1
     }
   }
 }
 
 foreach file [lsort [glob -directory $sources -type f *]] {
-  if {[string match *tileGtk_Symbols* $file ]} continue
+  if {[string match *gtkTtk_Symbols* $file ]} continue
   set fd [open $file]
   fconfigure $fd -encoding utf-8
   set data [read $fd]
@@ -364,7 +364,7 @@ foreach file [lsort [glob -directory $sources -type f *]] {
 
 ## Remove definitions...
 foreach s {g_new0} {
-  unset -nocomplain Symbols(TileGtk_$s)
+  unset -nocomplain Symbols(GtkTtk_$s)
 }
 
 switch $::tcl_platform(platform) {
@@ -379,20 +379,20 @@ switch $::tcl_platform(platform) {
   }
 }
 foreach s $not_native {
-  unset -nocomplain Symbols(TileGtk_$s)
+  unset -nocomplain Symbols(GtkTtk_$s)
 }
 
 ##
-## Generate file tileGtk_Symbols.cpp
+## Generate file gtkTtk_Symbols.cpp
 ##
-set fc [open $sources/tileGtk_Symbols.cpp w]
+set fc [open $sources/gtkTtk_Symbols.cpp w]
 fconfigure $fc -encoding iso8859-1
 puts $fc \
 {/*
- *  tileGtk_Symbols.cpp
+ *  gtkTtk_Symbols.cpp
  * ------------------------
  *
- * This file is part of the Tile-Gtk package, a Tk/Tile based theme that uses
+ * This file is part of the GtkTtk package, a ttk based theme that uses
  * Gtk/GNOME for drawing.
  *
  * Copyright (C) 2004-2012 by:
@@ -403,8 +403,8 @@ puts $fc \
  * Aghia Paraskevi, 153 10, Athens, Greece.
  */
 /* THIS FILE IS AUTOMATICALLY GENERATED - DO NOT EDIT! */
-#include "tileGtk_Symbols.h"
-#ifdef    TILEGTK_LOAD_GTK_DYNAMICALLY
+#include "gtkTtk_Symbols.h"
+#ifdef    GTKTTK_LOAD_GTK_DYNAMICALLY
 #if (TCL_MAJOR_VERSION >= 8) && (TCL_MINOR_VERSION >= 6)
 #define LOAD_SYMBOLS_WITH_TCL
 #endif
@@ -415,17 +415,17 @@ puts $fc \
 }
 
 ##
-## Generate file tileGtk_Symbols.h
+## Generate file gtkTtk_Symbols.h
 ##
 
-set fd [open $sources/tileGtk_Symbols.h w]
+set fd [open $sources/gtkTtk_Symbols.h w]
 fconfigure $fd -encoding iso8859-1
 puts $fd \
 {/*
- *  tileGtk_Symbols.h
+ *  gtkTtk_Symbols.h
  * --------------------
  *
- * This file is part of the Tile-Gtk package, a Tk/Tile based theme that uses
+ * This file is part of the GtkTtk package, a ttk based theme that uses
  * Gtk/GNOME for drawing.
  *
  * Copyright (C) 2004-2012 by:
@@ -436,8 +436,8 @@ puts $fd \
  * Aghia Paraskevi, 153 10, Athens, Greece.
  */
 /* THIS FILE IS AUTOMATICALLY GENERATED - DO NOT EDIT! */
-#ifndef _TILEGTK_SYMBOLS
-#define _TILEGTK_SYMBOLS
+#ifndef _GTKTTK_SYMBOLS
+#define _GTKTTK_SYMBOLS
 #include "tcl.h"
 #ifdef LOAD_SYMBOLS_WITH_TCL
 #else
@@ -453,20 +453,20 @@ puts $fd \
 #include <gdk/gdkwin32.h>
 #endif
 
-#ifdef    TILEGTK_LOAD_GTK_DYNAMICALLY}
+#ifdef    GTKTTK_LOAD_GTK_DYNAMICALLY}
 puts $fd "extern \"C\" \{"
 
 if {1} {
   foreach symbol [lsort -dictionary [array names Symbols]] {
-    set gtk_s [string range $symbol 8 end]
+    set gtk_s [string range $symbol 7 end]
     set lib [symbol2lib $gtk_s]
     foreach {t a} [get_function_spec $gtk_s] {break}
     puts $fd "  typedef $t (*Ptr_$gtk_s)($a);"
     puts $fd "  extern Ptr_$gtk_s $symbol;"
     puts $fc "Ptr_$gtk_s $symbol = 0;"
     lappend GTKSymbols($lib) $gtk_s;
-    #puts $fd "/*\n * $symbol: Stub for [string range $symbol 8 end]\n */"
-    #puts $fd "${symbol}() {\n  TILEGTK_ENSURE\n}; /* $symbol */\n"
+    #puts $fd "/*\n * $symbol: Stub for [string range $symbol 7 end]\n */"
+    #puts $fd "${symbol}() {\n  GTKTTK_ENSURE\n}; /* $symbol */\n"
   }
 }
 
@@ -475,17 +475,17 @@ puts $fd "\}\n"
 proc initialise_lib {lib} {
   global fc fd GTKSymbols
   puts $fd "extern int\
-            TileGtk_InitialiseSymbols_${lib}(Tcl_Interp *interp, Tcl_Obj *file_name);"
+            GtkTtk_InitialiseSymbols_${lib}(Tcl_Interp *interp, Tcl_Obj *file_name);"
   puts $fc "\nint\
-            TileGtk_InitialiseSymbols_${lib}(Tcl_Interp *interp, Tcl_Obj *file_name) \{"
+            GtkTtk_InitialiseSymbols_${lib}(Tcl_Interp *interp, Tcl_Obj *file_name) \{"
   puts $fc "#ifdef LOAD_SYMBOLS_WITH_TCL"
   puts $fc "  Tcl_LoadHandle loadHandle;" 
   puts $fc "  int status;" 
   puts $fc "  status = Tcl_LoadFile(interp, file_name, NULL, 0, NULL, &loadHandle);"
   puts $fc "  if (status != TCL_OK) return status;"
   foreach s $GTKSymbols($lib) {
-    puts $fc "  TileGtk_$s = (Ptr_$s) Tcl_FindSymbol(interp, loadHandle, \"$s\");"
-    puts $fc "  if (TileGtk_$s == NULL) return TCL_ERROR;"
+    puts $fc "  GtkTtk_$s = (Ptr_$s) Tcl_FindSymbol(interp, loadHandle, \"$s\");"
+    puts $fc "  if (GtkTtk_$s == NULL) return TCL_ERROR;"
   }
   puts $fc "#else"
   puts $fc "  const char *fname = Tcl_GetString(file_name);"
@@ -496,23 +496,23 @@ proc initialise_lib {lib} {
   puts $fc "    return TCL_ERROR;"
   puts $fc "  }"
   foreach s $GTKSymbols($lib) {
-    puts $fc "  if (!g_module_symbol(m, \"$s\", (gpointer *) &TileGtk_$s)) {"
+    puts $fc "  if (!g_module_symbol(m, \"$s\", (gpointer *) &GtkTtk_$s)) {"
     puts $fc "    Tcl_SetResult(interp, (char *) \"cannot find symbol: \", TCL_STATIC);"
     puts $fc "    Tcl_AppendResult(interp, (char *) \"$s\", (char *) NULL);"
     puts $fc "    return TCL_ERROR;"
     puts $fc "  }"
   }
   puts $fc "#endif"
-  puts $fc "  return TCL_OK;\n\}; /* TileGtk_InitialiseSymbols_${lib} */\n"
-  puts $fd "#define TILEGTK_LAST_SYMBOL_$lib TileGtk_$s"
+  puts $fc "  return TCL_OK;\n\}; /* GtkTtk_InitialiseSymbols_${lib} */\n"
+  puts $fd "#define GTKTTK_LAST_SYMBOL_$lib GtkTtk_$s"
 };# initialise_lib
 foreach lib [lsort [array names GTKSymbols]] {
   initialise_lib $lib
 }
 
 
 puts $fd {
-#else  /* TILEGTK_LOAD_GTK_DYNAMICALLY */
+#else  /* GTKTTK_LOAD_GTK_DYNAMICALLY */
 }
 
 ##
@@ -521,16 +521,16 @@ puts $fd {
 if {1} {
   foreach symbol [lsort -dictionary [array names Symbols]] {
     puts $fd "#define $symbol \\\n               \
-              [string range $symbol 8 end]"
+              [string range $symbol 7 end]"
   }
 }
 
 puts $fd \
-{#endif /* TILEGTK_LOAD_GTK_DYNAMICALLY */
+{#endif /* GTKTTK_LOAD_GTK_DYNAMICALLY */
 
-#endif /* _TILEGTK_SYMBOLS */}
+#endif /* _GTKTTK_SYMBOLS */}
 close $fd
 
 puts $fc \
-{#endif /* TILEGTK_LOAD_GTK_DYNAMICALLY */}
+{#endif /* GTKTTK_LOAD_GTK_DYNAMICALLY */}
 close $fc