Commit 25995faa authored by Manish Singh's avatar Manish Singh

Added Gordon Matzigkeit's patch for fixed length gtk entry fields

-Yosh
parent 621e1dd4
Sat Jan 3 00:41:28 PST 1998 Manish Singh <yosh@gimp.org>
* gtk/gtkentry.c:
* gtk/gtkentry.h: applied Gordon Matzigkeit's patch to add
fixed-length entry fields (gtk_entry_new_with_max_length)
Fri Jay 2 23:52 PST 1998 Jay Painter <jpaint@serv.net>
* reverted glibconfig.h and glib.h files back to the
way they were before my ugly hack
......
Sat Jan 3 00:41:28 PST 1998 Manish Singh <yosh@gimp.org>
* gtk/gtkentry.c:
* gtk/gtkentry.h: applied Gordon Matzigkeit's patch to add
fixed-length entry fields (gtk_entry_new_with_max_length)
Fri Jay 2 23:52 PST 1998 Jay Painter <jpaint@serv.net>
* reverted glibconfig.h and glib.h files back to the
way they were before my ugly hack
......
Sat Jan 3 00:41:28 PST 1998 Manish Singh <yosh@gimp.org>
* gtk/gtkentry.c:
* gtk/gtkentry.h: applied Gordon Matzigkeit's patch to add
fixed-length entry fields (gtk_entry_new_with_max_length)
Fri Jay 2 23:52 PST 1998 Jay Painter <jpaint@serv.net>
* reverted glibconfig.h and glib.h files back to the
way they were before my ugly hack
......
Sat Jan 3 00:41:28 PST 1998 Manish Singh <yosh@gimp.org>
* gtk/gtkentry.c:
* gtk/gtkentry.h: applied Gordon Matzigkeit's patch to add
fixed-length entry fields (gtk_entry_new_with_max_length)
Fri Jay 2 23:52 PST 1998 Jay Painter <jpaint@serv.net>
* reverted glibconfig.h and glib.h files back to the
way they were before my ugly hack
......
Sat Jan 3 00:41:28 PST 1998 Manish Singh <yosh@gimp.org>
* gtk/gtkentry.c:
* gtk/gtkentry.h: applied Gordon Matzigkeit's patch to add
fixed-length entry fields (gtk_entry_new_with_max_length)
Fri Jay 2 23:52 PST 1998 Jay Painter <jpaint@serv.net>
* reverted glibconfig.h and glib.h files back to the
way they were before my ugly hack
......
Sat Jan 3 00:41:28 PST 1998 Manish Singh <yosh@gimp.org>
* gtk/gtkentry.c:
* gtk/gtkentry.h: applied Gordon Matzigkeit's patch to add
fixed-length entry fields (gtk_entry_new_with_max_length)
Fri Jay 2 23:52 PST 1998 Jay Painter <jpaint@serv.net>
* reverted glibconfig.h and glib.h files back to the
way they were before my ugly hack
......
Sat Jan 3 00:41:28 PST 1998 Manish Singh <yosh@gimp.org>
* gtk/gtkentry.c:
* gtk/gtkentry.h: applied Gordon Matzigkeit's patch to add
fixed-length entry fields (gtk_entry_new_with_max_length)
Fri Jay 2 23:52 PST 1998 Jay Painter <jpaint@serv.net>
* reverted glibconfig.h and glib.h files back to the
way they were before my ugly hack
......
......@@ -320,6 +320,7 @@ gtk_entry_init (GtkEntry *entry)
entry->text = NULL;
entry->text_size = 0;
entry->text_length = 0;
entry->text_max_length = 0;
entry->current_pos = 0;
entry->selection_start_pos = 0;
entry->selection_end_pos = 0;
......@@ -374,6 +375,15 @@ gtk_entry_new ()
return GTK_WIDGET (gtk_type_new (gtk_entry_get_type ()));
}
GtkWidget*
gtk_entry_new_with_max_length (guint16 max)
{
GtkEntry *entry;
entry = gtk_type_new (gtk_entry_get_type ());
entry->text_max_length = max;
return GTK_WIDGET (entry);
}
void
gtk_entry_set_text (GtkEntry *entry,
const gchar *text)
......@@ -1651,6 +1661,15 @@ gtk_real_entry_insert_text (GtkEntry *entry,
g_return_if_fail (entry != NULL);
g_return_if_fail (GTK_IS_ENTRY (entry));
/* Make sure we do not exceed the maximum size of the entry. */
if (entry->text_max_length != 0 &&
new_text_length + entry->text_length > entry->text_max_length)
new_text_length = entry->text_max_length - entry->text_length;
/* Don't insert anything, if there was nothing to insert. */
if (new_text_length == 0)
return;
start_pos = *position;
end_pos = start_pos + new_text_length;
last_pos = new_text_length + entry->text_length;
......
......@@ -45,6 +45,7 @@ struct _GtkEntry
guint16 text_size;
guint16 text_length;
guint16 text_max_length;
gint16 current_pos;
gint16 selection_start_pos;
gint16 selection_end_pos;
......@@ -76,6 +77,7 @@ struct _GtkEntryClass
guint gtk_entry_get_type (void);
GtkWidget* gtk_entry_new (void);
GtkWidget* gtk_entry_new_with_max_length (guint16 max);
void gtk_entry_set_text (GtkEntry *entry,
const gchar *text);
void gtk_entry_append_text (GtkEntry *entry,
......
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