Commit c7ac3835 authored by Tim Janik's avatar Tim Janik Committed by Tim Janik

reverted bogus and undocumented!!! changes from Jay Cox (98/11/23

Thu Nov 26 03:18:08 1998  Tim Janik  <timj@gtk.org>

        * gtk/gtkclist.h:
        * gtk/gtkctree.h:
        * gtk/gtkclist.c:
        * gtk/gtkctree.c: reverted bogus and undocumented!!! changes from
        Jay Cox (98/11/23 13:53:26) which `const' qualified char* arrays.

        * gtk/maketypes.awk: changed underline substitution, so we get
        GTK_TYPE_CTREE_POS instead of the broken GTK_TYPE_C_TREE_POS.
        * gtk/makeenums.pl: likewise.
        * gtk/gtkctree.c: adapted type names accordingly.
parent ce073aac
Thu Nov 26 03:18:08 1998 Tim Janik <timj@gtk.org>
* gtk/gtkclist.h:
* gtk/gtkctree.h:
* gtk/gtkclist.c:
* gtk/gtkctree.c: reverted bogus and undocumented!!! changes from
Jay Cox (98/11/23 13:53:26) which `const' qualified char* arrays.
* gtk/maketypes.awk: changed underline substitution, so we get
GTK_TYPE_CTREE_POS instead of the broken GTK_TYPE_C_TREE_POS.
* gtk/makeenums.pl: likewise.
* gtk/gtkctree.c: adapted type names accordingly.
Tue Nov 24 11:31:06 1998 Owen Taylor <otaylor@redhat.com>
* docs/Changes-1.2.txt: Edited section on the ScrolledWindow.
......
Thu Nov 26 03:18:08 1998 Tim Janik <timj@gtk.org>
* gtk/gtkclist.h:
* gtk/gtkctree.h:
* gtk/gtkclist.c:
* gtk/gtkctree.c: reverted bogus and undocumented!!! changes from
Jay Cox (98/11/23 13:53:26) which `const' qualified char* arrays.
* gtk/maketypes.awk: changed underline substitution, so we get
GTK_TYPE_CTREE_POS instead of the broken GTK_TYPE_C_TREE_POS.
* gtk/makeenums.pl: likewise.
* gtk/gtkctree.c: adapted type names accordingly.
Tue Nov 24 11:31:06 1998 Owen Taylor <otaylor@redhat.com>
* docs/Changes-1.2.txt: Edited section on the ScrolledWindow.
......
Thu Nov 26 03:18:08 1998 Tim Janik <timj@gtk.org>
* gtk/gtkclist.h:
* gtk/gtkctree.h:
* gtk/gtkclist.c:
* gtk/gtkctree.c: reverted bogus and undocumented!!! changes from
Jay Cox (98/11/23 13:53:26) which `const' qualified char* arrays.
* gtk/maketypes.awk: changed underline substitution, so we get
GTK_TYPE_CTREE_POS instead of the broken GTK_TYPE_C_TREE_POS.
* gtk/makeenums.pl: likewise.
* gtk/gtkctree.c: adapted type names accordingly.
Tue Nov 24 11:31:06 1998 Owen Taylor <otaylor@redhat.com>
* docs/Changes-1.2.txt: Edited section on the ScrolledWindow.
......
Thu Nov 26 03:18:08 1998 Tim Janik <timj@gtk.org>
* gtk/gtkclist.h:
* gtk/gtkctree.h:
* gtk/gtkclist.c:
* gtk/gtkctree.c: reverted bogus and undocumented!!! changes from
Jay Cox (98/11/23 13:53:26) which `const' qualified char* arrays.
* gtk/maketypes.awk: changed underline substitution, so we get
GTK_TYPE_CTREE_POS instead of the broken GTK_TYPE_C_TREE_POS.
* gtk/makeenums.pl: likewise.
* gtk/gtkctree.c: adapted type names accordingly.
Tue Nov 24 11:31:06 1998 Owen Taylor <otaylor@redhat.com>
* docs/Changes-1.2.txt: Edited section on the ScrolledWindow.
......
Thu Nov 26 03:18:08 1998 Tim Janik <timj@gtk.org>
* gtk/gtkclist.h:
* gtk/gtkctree.h:
* gtk/gtkclist.c:
* gtk/gtkctree.c: reverted bogus and undocumented!!! changes from
Jay Cox (98/11/23 13:53:26) which `const' qualified char* arrays.
* gtk/maketypes.awk: changed underline substitution, so we get
GTK_TYPE_CTREE_POS instead of the broken GTK_TYPE_C_TREE_POS.
* gtk/makeenums.pl: likewise.
* gtk/gtkctree.c: adapted type names accordingly.
Tue Nov 24 11:31:06 1998 Owen Taylor <otaylor@redhat.com>
* docs/Changes-1.2.txt: Edited section on the ScrolledWindow.
......
Thu Nov 26 03:18:08 1998 Tim Janik <timj@gtk.org>
* gtk/gtkclist.h:
* gtk/gtkctree.h:
* gtk/gtkclist.c:
* gtk/gtkctree.c: reverted bogus and undocumented!!! changes from
Jay Cox (98/11/23 13:53:26) which `const' qualified char* arrays.
* gtk/maketypes.awk: changed underline substitution, so we get
GTK_TYPE_CTREE_POS instead of the broken GTK_TYPE_C_TREE_POS.
* gtk/makeenums.pl: likewise.
* gtk/gtkctree.c: adapted type names accordingly.
Tue Nov 24 11:31:06 1998 Owen Taylor <otaylor@redhat.com>
* docs/Changes-1.2.txt: Edited section on the ScrolledWindow.
......
Thu Nov 26 03:18:08 1998 Tim Janik <timj@gtk.org>
* gtk/gtkclist.h:
* gtk/gtkctree.h:
* gtk/gtkclist.c:
* gtk/gtkctree.c: reverted bogus and undocumented!!! changes from
Jay Cox (98/11/23 13:53:26) which `const' qualified char* arrays.
* gtk/maketypes.awk: changed underline substitution, so we get
GTK_TYPE_CTREE_POS instead of the broken GTK_TYPE_C_TREE_POS.
* gtk/makeenums.pl: likewise.
* gtk/gtkctree.c: adapted type names accordingly.
Tue Nov 24 11:31:06 1998 Owen Taylor <otaylor@redhat.com>
* docs/Changes-1.2.txt: Edited section on the ScrolledWindow.
......
......@@ -2,8 +2,6 @@ For 1.2.0 release:
- remove deprecated functions from *.[hc] files.
- finish composite child stuff.
- implement constructor functionality for all widgets.
- fix enum generation code which still puts out
GTK_TYPE_C_TREE_POS instead of GTK_TYPE_CTREE_POS
Bugs:
* Change bitfields to guints from enums, or vice versa?
......
......@@ -937,7 +937,7 @@ gtk_clist_init (GtkCList *clist)
void
gtk_clist_construct (GtkCList *clist,
gint columns,
const gchar *titles[])
gchar *titles[])
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
......@@ -1008,7 +1008,7 @@ gtk_clist_new (gint columns)
GtkWidget*
gtk_clist_new_with_titles (gint columns,
const gchar *titles[])
gchar *titles[])
{
GtkWidget *widget;
......@@ -2523,7 +2523,7 @@ cell_size_request (GtkCList *clist,
*/
gint
gtk_clist_prepend (GtkCList *clist,
const gchar *text[])
gchar *text[])
{
g_return_val_if_fail (clist != NULL, -1);
g_return_val_if_fail (GTK_IS_CLIST (clist), -1);
......@@ -2534,7 +2534,7 @@ gtk_clist_prepend (GtkCList *clist,
gint
gtk_clist_append (GtkCList *clist,
const gchar *text[])
gchar *text[])
{
g_return_val_if_fail (clist != NULL, -1);
g_return_val_if_fail (GTK_IS_CLIST (clist), -1);
......@@ -2546,7 +2546,7 @@ gtk_clist_append (GtkCList *clist,
gint
gtk_clist_insert (GtkCList *clist,
gint row,
const gchar *text[])
gchar *text[])
{
g_return_val_if_fail (clist != NULL, -1);
g_return_val_if_fail (GTK_IS_CLIST (clist), -1);
......
......@@ -378,12 +378,12 @@ GtkType gtk_clist_get_type (void);
/* constructors useful for gtk-- wrappers */
void gtk_clist_construct (GtkCList *clist,
gint columns,
const gchar *titles[]);
gchar *titles[]);
/* create a new GtkCList */
GtkWidget* gtk_clist_new (gint columns);
GtkWidget* gtk_clist_new_with_titles (gint columns,
const gchar *titles[]);
gchar *titles[]);
/* set adjustments of clist */
void gtk_clist_set_hadjustment (GtkCList *clist,
......@@ -605,16 +605,16 @@ gboolean gtk_clist_get_selectable (GtkCList *clist,
* making it easier to append and modify a row
*/
gint gtk_clist_prepend (GtkCList *clist,
const gchar *text[]);
gchar *text[]);
gint gtk_clist_append (GtkCList *clist,
const gchar *text[]);
gchar *text[]);
/* inserts a row at index row and returns the row where it was
* actually inserted (may be different from "row" in auto_sort mode)
*/
gint gtk_clist_insert (GtkCList *clist,
gint row,
const gchar *text[]);
gchar *text[]);
/* removes row at index row */
void gtk_clist_remove (GtkCList *clist,
......
......@@ -354,11 +354,11 @@ gtk_ctree_class_init (GtkCTreeClass *klass)
GTK_ARG_READWRITE,
ARG_USE_DRAG_ICONS);
gtk_object_add_arg_type ("GtkCTree::line_style",
GTK_TYPE_C_TREE_LINE_STYLE,
GTK_TYPE_CTREE_LINE_STYLE,
GTK_ARG_READWRITE,
ARG_LINE_STYLE);
gtk_object_add_arg_type ("GtkCTree::expander_style",
GTK_TYPE_C_TREE_EXPANDER_STYLE,
GTK_TYPE_CTREE_EXPANDER_STYLE,
GTK_ARG_READWRITE,
ARG_EXPANDER_STYLE);
object_class->set_arg = gtk_ctree_set_arg;
......@@ -407,7 +407,7 @@ gtk_ctree_class_init (GtkCTreeClass *klass)
GTK_SIGNAL_OFFSET (GtkCTreeClass,
change_focus_row_expansion),
gtk_marshal_NONE__ENUM,
GTK_TYPE_NONE, 1, GTK_TYPE_C_TREE_EXPANSION_TYPE);
GTK_TYPE_NONE, 1, GTK_TYPE_CTREE_EXPANSION_TYPE);
gtk_object_class_add_signals (object_class, ctree_signals, LAST_SIGNAL);
widget_class->realize = gtk_ctree_realize;
......@@ -3883,7 +3883,7 @@ void
gtk_ctree_construct (GtkCTree *ctree,
gint columns,
gint tree_column,
const gchar *titles[])
gchar *titles[])
{
GtkCList *clist;
......@@ -3913,7 +3913,7 @@ gtk_ctree_construct (GtkCTree *ctree,
GtkWidget *
gtk_ctree_new_with_titles (gint columns,
gint tree_column,
const gchar *titles[])
gchar *titles[])
{
GtkWidget *widget;
......
......@@ -177,10 +177,10 @@ GtkType gtk_ctree_get_type (void);
void gtk_ctree_construct (GtkCTree *ctree,
gint columns,
gint tree_column,
const gchar *titles[]);
gchar *titles[]);
GtkWidget * gtk_ctree_new_with_titles (gint columns,
gint tree_column,
const gchar *titles[]);
gchar *titles[]);
GtkWidget * gtk_ctree_new (gint columns,
gint tree_column);
GtkCTreeNode * gtk_ctree_insert_node (GtkCTree *ctree,
......
......@@ -199,11 +199,12 @@ while (<>) {
print ")\n";
} else {
($valuename = $enumname) =~ s/([A-Z][a-z])/_$1/g;
$valuename =~ s/([a-z])([A-Z])/$1_$2/g;
$valuename = lc($valuename);
my $valuename = $enumname;
$valuename =~ s/([^A-Z])([A-Z])/$1_$2/g;
$valuename =~ s/([A-Z][A-Z])([A-Z][0-9a-z])/$1_$2/g;
$valuename = lc($valuename);
print "static GtkEnumValue $ {valuename}_values[] = {\n";
print "static GtkEnumValue _${valuename}_values[] = {\n";
for (@entries) {
my ($name,$nick) = @{$_};
print qq( { $name, "$name", "$nick" },\n);
......
......@@ -36,17 +36,18 @@ function set_type (set_type_1)
{
type_counter += 1;
type_name = set_type_1;
type_macro = "GTK_TYPE";
tmp = type_name
gsub ("[A-Z][a-z]", "_&", tmp);
# OK, the following is ridiculous. But easier than writing a loop
gsub ("[a-z]", "&@", tmp);
gsub ("@[A-Z]", "@&", tmp);
gsub ("@@", "_", tmp);
type_macro = "GTK_TYPE_";
tmp = type_name;
# OK, the following is ridiculous, and sed s///g would be far easier
gsub ("[A-Z]", "@&", tmp);
gsub ("[^A-Z]@", "&_", tmp);
gsub ("@", "", tmp);
gsub ("[A-Z][A-Z][A-Z][0-9a-z]", "@&", tmp);
gsub ("@..", "&_", tmp);
gsub ("@", "", tmp);
type_macro = type_macro toupper (tmp);
type_ident = tolower (tmp);
type_ident = "_" tolower (tmp);
sub ("^GTK_TYPE_GTK_", "GTK_TYPE_", type_macro);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment