added args ::show_text, ::text_xalign, ::text_yalign, ::activity_mode.
Sun Nov 22 16:21:28 1998 Tim Janik <timj@gtk.org> * gtk/gtkprogress.c: added args ::show_text, ::text_xalign, ::text_yalign, ::activity_mode. * gtk/gtkprogressbar.c: added construct arg ::adjustment. added args ::bar_style, ::orientation, ::discrete_blocks, ::activity_step, ::activity_blocks. (gtk_progress_bar_new): (gtk_progress_bar_new_with_adjustment): use gtk_widget_new(). (gtk_progress_bar_construct): deprecated. * gtk/gtkvscrollbar.c: (gtk_vscrollbar_draw_step_back): (gtk_vscrollbar_draw_step_forw): use "vscrollbar" as detail for gtk_paint_arrow, to be consistent with hscrollbar. * gtk/gtktext.c added construct args ::hadjustment, ::vadjustment. added args ::line_wrap, ::word_wrap. (gtk_text_class_init): added scroll_adjustments signal. (gtk_text_new): use gtk_widget_new. (gtk_text_disconnect): remove adjustement with gtk_text_set_adjustments, so we don't screw the reference counts and don't leave signals connected. (gtk_text_destroy): disconnect adjustments signals. (gtk_text_finalize): unref adjustments. * gtk/gtkctree.c: added construct args ::n_columns and ::tree_column. added args ::indent, ::spacing, ::show_stub, ::reorderable, ::use_drag_icons, ::line_style and ::expander_style. (gtk_ctree_set_show_stub): renamed from gtk_ctree_show_stub, which is deprecated now. * gtk/gtkclist.h: remove GTK_CLIST_CONSTRUCT flag. * gtk/gtkclist.c: removed ::vadjustment and ::hadjustment args, introduced ::scroll_adjustments signal. added ::shadow_type, ::selection_mode and ::row_height args. added n_columns construct arg. (gtk_clist_construct): call gtk_object_constructed(). (gtk_clist_set_row_height): if height is passed as 0, revert to automatic height calculation. (gtk_clist_destroy): before unrefing the adjustments, disconnect our signal handlers. Fri Nov 21 22:34:58 1998 Tim Janik <timj@gtk.org> * gtk/gtkwidget.c (gtk_widget_new): call gtk_object_default_construct like gtk_object_new. (gtk_widget_destroy): assert that we only destroy constructed widgets. * gtk/gtkobject.h (enum GtkArgFlags): new flag GTK_ARG_CONSTRUCT_ONLY to identify args that may only be used for construction. GTK_ARG_CONSTRUCT maybe used as normal arguments besides construction time. * gtk/gtkobject.c (gtk_object_new): invoke gtk_object_default_construct at the end if the object is not fully constructed. (gtk_object_newv): likewise. (gtk_object_destroy): assert that we only destroy constructed objects. (gtk_object_init): setup GTK_CONSTRUCTED from the objects real klass. (gtk_object_default_construct): new function to complete default construction of an object by applying missing construtor args with default values of 0, 0.0 or NULL. (gtk_object_constructed): new function to mark an object as being constructed (used from within constructors). * gtk/gtkarg.c (gtk_arg_type_new_static): return the args info pointer so it is immediatedly available for the caller. * gtk/gtktypeutils.c (gtk_type_new): pass an object's real class to the object initilizer (GtkObjectInitFunc takes a second arg now, the real klass), and asure that object initializers may temporarily alter the class pointer. Fri Nov 20 08:00:30 1998 Tim Janik <timj@gtk.org> * gtk/testgtk.c: change all occourances of gtk_container_add ( scrolled_window, widget) to gtk_scrolled_window_add_with_viewport (...) for widget!=(clist, ctree, text, viewport). * gtk/gtkcombo.c: (gtk_combo_init): use gtk_scrolled_window_add_with_viewport() to add children to the scrolled window. * gtk/gtkscrolledwindow.h: * gtk/gtkscrolledwindow.c: changed scrolled_window->viewport to scrolled_window->child, and use gtk_widget_scroll_adjustements() to set the scroll adjustments for the widget, we do not create an additional viewport anymore. added ::hadjustment and ::vadjustment constructor args. (gtk_scrolled_window_new): use gtk_widget_new() to create the widget. (gtk_scrolled_window_set_hadjustment): (gtk_scrolled_window_set_vadjustment): new functions that superceed gtk_scrolled_window_construct. (gtk_scrolled_window_construct): deprecated this function. * gtk/gtkhscrollbar.c: * gtk/gtkvscrollbar.c: * gtk/gtkhscale.c: * gtk/gtkvscale.c: support a constructor arg "::adjustment", and use gtk_widget_new() for the widget creation. * gtk/gtkrange.c: added ::update_policy arg. (gtk_range_set_adjustment): if adjustment is passed in as NULL, create a default adjustment so this function can be used for derived widgets that depend on the adjustment's existance. (gtk_range_destroy): disconnect the adjustment signal, so we don't get called after we got destroyed, we don't destroy the adjustment in here, because it might have been provided from another widget. * gtk/gtkviewport.c: introduced ::scroll_adjustments signal. (gtk_viewport_destroy): same as gtk_range_destroy. * gtk/gtkprogress.c (gtk_progress_destroy): same as gtk_range_destroy. * gtk/gtkwidget.h: * gtk/gtkwidget.c: changed gtk_widget_activate() to return a gboolean, indicating whether this widget supports activation. added gtk_widget_scroll_adjustements() to set the scrolling adjustments of a widget. Wed Nov 19 01:22:42 1998 Tim Janik <timj@gtk.org> * gtk/gtkoptionmenu.c: (gtk_option_menu_remove_contents): (gtk_option_menu_update_contents): removed gtk_container_[un]block_resize() pairs. * gtk/gtknotebook.h: * gtk/gtknotebook.c: removed the tab_border field, since it shouldn't be used outside of gtknotebook.c anyways. made ARG_TAB_BORDER a wrtie-only argument. * *.c: made deprecated functions issue a message: gtk_clist_set_border, gtk_container_block_resize, gtk_container_unblock_resize, gtk_container_need_resize, gtk_object_class_add_user_signal, gtk_spin_button_construct, gtk_scrolled_window_construct. removed non-functional functions: gtk_container_disable_resize, gtk_container_enable_resize, gtk_clist_set_policy. Wed Nov 18 22:54:36 1998 Tim Janik <timj@gtk.org> * gtk/gtkbox.c (gtk_box_init): * gtk/gtkdrawingarea.c (gtk_drawing_area_init): * gtk/gtkeventbox.c (gtk_event_box_init): * gtk/gtkfixed.c (gtk_fixed_init): * gtk/gtkframe.c (gtk_frame_init): * gtk/gtkhandlebox.c (gtk_handle_box_init): * gtk/gtkpacker.c (gtk_packer_init): * gtk/gtkmisc.c (gtk_misc_init): * gtk/gtkpreview.c (gtk_preview_init): * gtk/gtkprogress.c (gtk_progress_init): * gtk/gtkprogressbar.c (gtk_progress_bar_init): * gtk/gtkseparator.c (gtk_separator_init): * gtk/gtktable.c (gtk_table_init): * gtk/gtkviewport.c (gtk_viewport_init): * gtk/gtkalignment.c (gtk_alignment_init): removed setting of the GTK_BASIC flag. * gtk/gtkwidget.h: * gtk/gtkwidget.c: removed GTK_BASIC, GTK_WIDGET_BASIC and gtk_widget_basic. * miscellaneous GtkType and macro fixups.
This commit is contained in:
Tim Janik
170
gtk/gtktext.c
170
gtk/gtktext.c
@ -87,6 +87,14 @@
|
||||
#define LAST_INDEX(t, m) ((m).index == TEXT_LENGTH(t))
|
||||
#define CACHE_DATA(c) (*(LineParams*)(c)->data)
|
||||
|
||||
enum {
|
||||
ARG_0,
|
||||
ARG_HADJUSTMENT,
|
||||
ARG_VADJUSTMENT,
|
||||
ARG_LINE_WRAP,
|
||||
ARG_WORD_WRAP
|
||||
};
|
||||
|
||||
typedef struct _TextProperty TextProperty;
|
||||
typedef struct _TabStopMark TabStopMark;
|
||||
typedef struct _PrevTabCont PrevTabCont;
|
||||
@ -180,6 +188,12 @@ struct _LineParams
|
||||
|
||||
|
||||
static void gtk_text_class_init (GtkTextClass *klass);
|
||||
static void gtk_text_set_arg (GtkObject *object,
|
||||
GtkArg *arg,
|
||||
guint arg_id);
|
||||
static void gtk_text_get_arg (GtkObject *object,
|
||||
GtkArg *arg,
|
||||
guint arg_id);
|
||||
static void gtk_text_init (GtkText *text);
|
||||
static void gtk_text_destroy (GtkObject *object);
|
||||
static void gtk_text_finalize (GtkObject *object);
|
||||
@ -518,9 +532,27 @@ gtk_text_class_init (GtkTextClass *class)
|
||||
object_class = (GtkObjectClass*) class;
|
||||
widget_class = (GtkWidgetClass*) class;
|
||||
editable_class = (GtkEditableClass*) class;
|
||||
|
||||
parent_class = gtk_type_class (GTK_TYPE_EDITABLE);
|
||||
|
||||
|
||||
gtk_object_add_arg_type ("GtkText::hadjustment",
|
||||
GTK_TYPE_ADJUSTMENT,
|
||||
GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT,
|
||||
ARG_HADJUSTMENT);
|
||||
gtk_object_add_arg_type ("GtkText::vadjustment",
|
||||
GTK_TYPE_ADJUSTMENT,
|
||||
GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT,
|
||||
ARG_VADJUSTMENT);
|
||||
gtk_object_add_arg_type ("GtkText::line_wrap",
|
||||
GTK_TYPE_BOOL,
|
||||
GTK_ARG_READWRITE,
|
||||
ARG_LINE_WRAP);
|
||||
gtk_object_add_arg_type ("GtkText::word_wrap",
|
||||
GTK_TYPE_BOOL,
|
||||
GTK_ARG_READWRITE,
|
||||
ARG_WORD_WRAP);
|
||||
|
||||
object_class->set_arg = gtk_text_set_arg;
|
||||
object_class->get_arg = gtk_text_get_arg;
|
||||
object_class->destroy = gtk_text_destroy;
|
||||
object_class->finalize = gtk_text_finalize;
|
||||
|
||||
@ -539,6 +571,14 @@ gtk_text_class_init (GtkTextClass *class)
|
||||
widget_class->focus_in_event = gtk_text_focus_in;
|
||||
widget_class->focus_out_event = gtk_text_focus_out;
|
||||
|
||||
widget_class->scroll_adjustments_signal =
|
||||
gtk_signal_new ("scroll_adjustments",
|
||||
GTK_RUN_LAST,
|
||||
object_class->type,
|
||||
GTK_SIGNAL_OFFSET (GtkTextClass, scroll_adjustments),
|
||||
gtk_marshal_NONE__POINTER_POINTER,
|
||||
GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
|
||||
|
||||
editable_class->set_editable = gtk_text_real_set_editable;
|
||||
editable_class->insert_text = gtk_text_insert_text;
|
||||
editable_class->delete_text = gtk_text_delete_text;
|
||||
@ -557,12 +597,82 @@ gtk_text_class_init (GtkTextClass *class)
|
||||
editable_class->get_chars = gtk_text_get_chars;
|
||||
editable_class->set_selection = gtk_text_set_selection;
|
||||
editable_class->set_position = gtk_text_set_position;
|
||||
|
||||
class->scroll_adjustments = gtk_text_set_adjustments;
|
||||
}
|
||||
|
||||
static void
|
||||
gtk_text_set_arg (GtkObject *object,
|
||||
GtkArg *arg,
|
||||
guint arg_id)
|
||||
{
|
||||
GtkText *text;
|
||||
|
||||
text = GTK_TEXT (object);
|
||||
|
||||
switch (arg_id)
|
||||
{
|
||||
case ARG_HADJUSTMENT:
|
||||
gtk_text_set_adjustments (text,
|
||||
GTK_VALUE_POINTER (*arg),
|
||||
text->vadj);
|
||||
break;
|
||||
case ARG_VADJUSTMENT:
|
||||
gtk_text_set_adjustments (text,
|
||||
text->hadj,
|
||||
GTK_VALUE_POINTER (*arg));
|
||||
break;
|
||||
case ARG_LINE_WRAP:
|
||||
gtk_text_set_line_wrap (text, GTK_VALUE_BOOL (*arg));
|
||||
break;
|
||||
case ARG_WORD_WRAP:
|
||||
gtk_text_set_word_wrap (text, GTK_VALUE_BOOL (*arg));
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
gtk_text_get_arg (GtkObject *object,
|
||||
GtkArg *arg,
|
||||
guint arg_id)
|
||||
{
|
||||
GtkText *text;
|
||||
|
||||
text = GTK_TEXT (object);
|
||||
|
||||
switch (arg_id)
|
||||
{
|
||||
case ARG_HADJUSTMENT:
|
||||
GTK_VALUE_POINTER (*arg) = text->hadj;
|
||||
break;
|
||||
case ARG_VADJUSTMENT:
|
||||
GTK_VALUE_POINTER (*arg) = text->vadj;
|
||||
break;
|
||||
case ARG_LINE_WRAP:
|
||||
GTK_VALUE_BOOL (*arg) = text->line_wrap;
|
||||
break;
|
||||
case ARG_WORD_WRAP:
|
||||
GTK_VALUE_BOOL (*arg) = text->word_wrap;
|
||||
break;
|
||||
default:
|
||||
arg->type = GTK_TYPE_INVALID;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
gtk_text_init (GtkText *text)
|
||||
{
|
||||
GTK_WIDGET_SET_FLAGS (text, GTK_CAN_FOCUS);
|
||||
|
||||
text->text_area = NULL;
|
||||
text->hadj = NULL;
|
||||
text->vadj = NULL;
|
||||
text->gc = NULL;
|
||||
text->line_wrap_bitmap = NULL;
|
||||
text->line_arrow_bitmap = NULL;
|
||||
|
||||
text->text = g_new (guchar, INITIAL_BUFFER_SIZE);
|
||||
text->text_len = INITIAL_BUFFER_SIZE;
|
||||
@ -589,24 +699,31 @@ gtk_text_init (GtkText *text)
|
||||
text->button = 0;
|
||||
|
||||
text->current_font = NULL;
|
||||
|
||||
|
||||
init_properties (text);
|
||||
|
||||
GTK_EDITABLE(text)->editable = FALSE;
|
||||
|
||||
GTK_EDITABLE (text)->editable = FALSE;
|
||||
|
||||
gtk_editable_set_position (GTK_EDITABLE (text), 0);
|
||||
}
|
||||
|
||||
GtkWidget*
|
||||
gtk_text_new (GtkAdjustment *hadj,
|
||||
GtkAdjustment *vadj)
|
||||
{
|
||||
GtkText *text;
|
||||
|
||||
text = gtk_type_new (GTK_TYPE_TEXT);
|
||||
|
||||
gtk_text_set_adjustments (text, hadj, vadj);
|
||||
gtk_editable_set_position (GTK_EDITABLE (text), 0);
|
||||
|
||||
return GTK_WIDGET (text);
|
||||
GtkWidget *text;
|
||||
|
||||
if (hadj)
|
||||
g_return_val_if_fail (GTK_IS_ADJUSTMENT (hadj), NULL);
|
||||
if (vadj)
|
||||
g_return_val_if_fail (GTK_IS_ADJUSTMENT (vadj), NULL);
|
||||
|
||||
text = gtk_widget_new (GTK_TYPE_TEXT,
|
||||
"hadjustment", hadj,
|
||||
"vadjustment", vadj,
|
||||
NULL);
|
||||
|
||||
return text;
|
||||
}
|
||||
|
||||
void
|
||||
@ -711,6 +828,7 @@ gtk_text_set_adjustments (GtkText *text,
|
||||
gtk_signal_connect (GTK_OBJECT (text->hadj), "disconnect",
|
||||
(GtkSignalFunc) gtk_text_disconnect,
|
||||
text);
|
||||
gtk_text_adjustment (hadj, text);
|
||||
}
|
||||
|
||||
if (text->vadj != vadj)
|
||||
@ -728,6 +846,7 @@ gtk_text_set_adjustments (GtkText *text,
|
||||
gtk_signal_connect (GTK_OBJECT (text->vadj), "disconnect",
|
||||
(GtkSignalFunc) gtk_text_disconnect,
|
||||
text);
|
||||
gtk_text_adjustment (vadj, text);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1018,17 +1137,11 @@ gtk_text_destroy (GtkObject *object)
|
||||
g_return_if_fail (object != NULL);
|
||||
g_return_if_fail (GTK_IS_TEXT (object));
|
||||
|
||||
text = (GtkText *)object;
|
||||
if (text->hadj)
|
||||
{
|
||||
gtk_object_unref (GTK_OBJECT (text->hadj));
|
||||
text->hadj = NULL;
|
||||
}
|
||||
if (text->vadj)
|
||||
{
|
||||
gtk_object_unref (GTK_OBJECT (text->vadj));
|
||||
text->vadj = NULL;
|
||||
}
|
||||
text = (GtkText*) object;
|
||||
|
||||
gtk_signal_disconnect_by_data (GTK_OBJECT (text->hadj), text);
|
||||
gtk_signal_disconnect_by_data (GTK_OBJECT (text->hadj), text);
|
||||
|
||||
if (text->timer)
|
||||
{
|
||||
gtk_timeout_remove (text->timer);
|
||||
@ -1049,6 +1162,9 @@ gtk_text_finalize (GtkObject *object)
|
||||
|
||||
text = (GtkText *)object;
|
||||
|
||||
gtk_object_unref (GTK_OBJECT (text->hadj));
|
||||
gtk_object_unref (GTK_OBJECT (text->vadj));
|
||||
|
||||
/* Clean up the internal structures */
|
||||
g_free (text->text);
|
||||
free_cache (text);
|
||||
@ -2110,11 +2226,11 @@ gtk_text_disconnect (GtkAdjustment *adjustment,
|
||||
g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
|
||||
g_return_if_fail (text != NULL);
|
||||
g_return_if_fail (GTK_IS_TEXT (text));
|
||||
|
||||
|
||||
if (adjustment == text->hadj)
|
||||
text->hadj = NULL;
|
||||
gtk_text_set_adjustments (text, NULL, text->vadj);
|
||||
if (adjustment == text->vadj)
|
||||
text->vadj = NULL;
|
||||
gtk_text_set_adjustments (text, text->hadj, NULL);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user