Index: gtkcompat.h.win32 =================================================================== RCS file: /home/cvs/src/ide/external/win32gtk/gtk+/gtk/gtkcompat.h.win32,v retrieving revision 1.1 retrieving revision 1.2 diff -c -r1.1 -r1.2 *** gtkcompat.h.win32 2001/01/03 00:08:10 1.1 --- gtkcompat.h.win32 2001/06/28 23:42:04 1.2 *************** *** 64,70 **** #define gtk_container_border_width gtk_container_set_border_width #define gtk_notebook_current_page gtk_notebook_get_current_page #define gtk_packer_configure gtk_packer_set_child_packing ! #define gtk_paned_gutter_size gtk_paned_set_gutter_size #define gtk_paned_handle_size gtk_paned_set_handle_size #define gtk_scale_value_width gtk_scale_get_value_width #define gtk_window_position gtk_window_set_position --- 64,71 ---- #define gtk_container_border_width gtk_container_set_border_width #define gtk_notebook_current_page gtk_notebook_get_current_page #define gtk_packer_configure gtk_packer_set_child_packing ! #define gtk_paned_gutter_size(p,s) (void) 0 ! #define gtk_paned_set_gutter_size(p,s) (void) 0 #define gtk_paned_handle_size gtk_paned_set_handle_size #define gtk_scale_value_width gtk_scale_get_value_width #define gtk_window_position gtk_window_set_position Index: gtkhpaned.c =================================================================== RCS file: /home/cvs/src/ide/external/win32gtk/gtk+/gtk/gtkhpaned.c,v retrieving revision 1.1 retrieving revision 1.2 diff -c -r1.1 -r1.2 *** gtkhpaned.c 2001/01/03 00:08:11 1.1 --- gtkhpaned.c 2001/05/17 20:16:27 1.2 *************** *** 34,40 **** GtkAllocation *allocation); static void gtk_hpaned_draw (GtkWidget *widget, GdkRectangle *area); ! static void gtk_hpaned_xor_line (GtkPaned *paned); static gboolean gtk_hpaned_button_press (GtkWidget *widget, GdkEventButton *event); static gboolean gtk_hpaned_button_release (GtkWidget *widget, --- 34,40 ---- GtkAllocation *allocation); static void gtk_hpaned_draw (GtkWidget *widget, GdkRectangle *area); ! /*static void gtk_hpaned_xor_line (GtkPaned *paned);*/ static gboolean gtk_hpaned_button_press (GtkWidget *widget, GdkEventButton *event); static gboolean gtk_hpaned_button_release (GtkWidget *widget, *************** *** 274,310 **** } } ! static void ! gtk_hpaned_xor_line (GtkPaned *paned) ! { ! GtkWidget *widget; ! GdkGCValues values; ! guint16 xpos; ! ! widget = GTK_WIDGET(paned); ! ! if (!paned->xor_gc) ! { ! values.function = GDK_INVERT; ! values.subwindow_mode = GDK_INCLUDE_INFERIORS; ! paned->xor_gc = gdk_gc_new_with_values (widget->window, ! &values, ! GDK_GC_FUNCTION | GDK_GC_SUBWINDOW); ! } ! ! gdk_gc_set_line_attributes (paned->xor_gc, 2, GDK_LINE_SOLID, ! GDK_CAP_NOT_LAST, GDK_JOIN_BEVEL); ! ! xpos = paned->child1_size ! + GTK_CONTAINER (paned)->border_width + paned->handle_size / 2; ! ! gdk_draw_line (widget->window, paned->xor_gc, ! xpos, ! 0, ! xpos, ! widget->allocation.height - 1); ! } ! static gboolean gtk_hpaned_button_press (GtkWidget *widget, GdkEventButton *event) --- 274,310 ---- } } ! /*static void*/ ! /*gtk_hpaned_xor_line (GtkPaned *paned)*/ ! /*{*/ ! /* GtkWidget *widget;*/ ! /* GdkGCValues values;*/ ! /* guint16 xpos;*/ ! /**/ ! /* widget = GTK_WIDGET(paned);*/ ! /**/ ! /* if (!paned->xor_gc)*/ ! /* {*/ ! /* values.function = GDK_INVERT;*/ ! /* values.subwindow_mode = GDK_INCLUDE_INFERIORS;*/ ! /* paned->xor_gc = gdk_gc_new_with_values (widget->window,*/ ! /* &values,*/ ! /* GDK_GC_FUNCTION | GDK_GC_SUBWINDOW);*/ ! /* }*/ ! /**/ ! /* gdk_gc_set_line_attributes (paned->xor_gc, 2, GDK_LINE_SOLID,*/ ! /* GDK_CAP_NOT_LAST, GDK_JOIN_BEVEL);*/ ! /**/ ! /* xpos = paned->child1_size*/ ! /* + GTK_CONTAINER (paned)->border_width + paned->handle_size / 2;*/ ! /**/ ! /* gdk_draw_line (widget->window, paned->xor_gc,*/ ! /* xpos,*/ ! /* 0,*/ ! /* xpos,*/ ! /* widget->allocation.height - 1);*/ ! /*}*/ ! /**/ static gboolean gtk_hpaned_button_press (GtkWidget *widget, GdkEventButton *event) *************** *** 332,338 **** widget->allocation.width - paned->handle_size - 2 * GTK_CONTAINER (paned)->border_width); ! gtk_hpaned_xor_line (paned); return TRUE; } --- 332,339 ---- widget->allocation.width - paned->handle_size - 2 * GTK_CONTAINER (paned)->border_width); ! /* gtk_hpaned_xor_line (paned);*/ ! gtk_widget_queue_resize (GTK_WIDGET (paned)); return TRUE; } *************** *** 353,359 **** if (paned->in_drag && (event->button == 1)) { ! gtk_hpaned_xor_line (paned); paned->in_drag = FALSE; paned->position_set = TRUE; gdk_pointer_ungrab (event->time); --- 354,360 ---- if (paned->in_drag && (event->button == 1)) { ! /* gtk_hpaned_xor_line (paned);*/ paned->in_drag = FALSE; paned->position_set = TRUE; gdk_pointer_ungrab (event->time); *************** *** 386,394 **** { gint size = x - GTK_CONTAINER (paned)->border_width - paned->handle_size / 2; ! gtk_hpaned_xor_line (paned); paned->child1_size = CLAMP (size, paned->min_position, paned->max_position); ! gtk_hpaned_xor_line (paned); } return TRUE; --- 387,396 ---- { gint size = x - GTK_CONTAINER (paned)->border_width - paned->handle_size / 2; ! /* gtk_hpaned_xor_line (paned);*/ paned->child1_size = CLAMP (size, paned->min_position, paned->max_position); ! /* gtk_hpaned_xor_line (paned);*/ ! gtk_widget_queue_resize (GTK_WIDGET (paned)); } return TRUE; Index: gtklabel.c =================================================================== RCS file: /home/cvs/src/ide/external/win32gtk/gtk+/gtk/gtklabel.c,v retrieving revision 1.1 retrieving revision 1.2 diff -c -r1.1 -r1.2 *** gtklabel.c 2001/01/03 00:08:11 1.1 --- gtklabel.c 2001/02/11 22:56:08 1.2 *************** *** 683,693 **** j-i, &lbearing, &rbearing, &width, NULL, &descent); ! y_max = MAX (descent + 2, y_max); uline = gtk_label_uline_alloc (); uline->x1 = offset + line->x + lbearing - 1; uline->x2 = offset + line->x + rbearing; ! uline->y = line->y + descent + 2; uline->next = line->uline; line->uline = uline; i = j - 1; --- 683,694 ---- j-i, &lbearing, &rbearing, &width, NULL, &descent); ! descent = GTK_WIDGET (label)->style->font->descent; ! y_max = MAX (descent - 1, y_max); uline = gtk_label_uline_alloc (); uline->x1 = offset + line->x + lbearing - 1; uline->x2 = offset + line->x + rbearing; ! uline->y = line->y + descent - 1; uline->next = line->uline; line->uline = uline; i = j - 1; Index: gtkrange.c =================================================================== RCS file: /home/cvs/src/ide/external/win32gtk/gtk+/gtk/gtkrange.c,v retrieving revision 1.1 retrieving revision 1.2 diff -c -r1.1 -r1.2 *** gtkrange.c 2001/01/03 00:08:12 1.1 --- gtkrange.c 2001/09/04 16:18:06 1.2 *************** *** 30,37 **** #include "gtksignal.h" ! #define SCROLL_TIMER_LENGTH 20 ! #define SCROLL_INITIAL_DELAY 100 #define SCROLL_DELAY_LENGTH 300 #define RANGE_CLASS(w) GTK_RANGE_CLASS (GTK_OBJECT (w)->klass) --- 30,37 ---- #include "gtksignal.h" ! #define SCROLL_TIMER_LENGTH 30 ! #define SCROLL_INITIAL_DELAY 150 #define SCROLL_DELAY_LENGTH 300 #define RANGE_CLASS(w) GTK_RANGE_CLASS (GTK_OBJECT (w)->klass) *************** *** 1286,1292 **** { GdkModifierType mods, mask; ! if (!range->timer) { return_val = FALSE; if (range->need_timer) --- 1286,1292 ---- { GdkModifierType mods, mask; ! if (!range->timer || range->need_timer) { return_val = FALSE; if (range->need_timer) Index: gtktable.c =================================================================== RCS file: /home/cvs/src/ide/external/win32gtk/gtk+/gtk/gtktable.c,v retrieving revision 1.1 retrieving revision 1.3 diff -c -r1.1 -r1.3 *** gtktable.c 2001/01/03 00:08:12 1.1 --- gtktable.c 2001/01/05 22:58:37 1.3 *************** *** 536,554 **** gtk_widget_set_parent (child, GTK_WIDGET (table)); ! if (GTK_WIDGET_VISIBLE (GTK_WIDGET (table))) { ! if (GTK_WIDGET_REALIZED (GTK_WIDGET (table)) && ! !GTK_WIDGET_REALIZED (child)) ! gtk_widget_realize (child); ! ! if (GTK_WIDGET_MAPPED (GTK_WIDGET (table)) && ! !GTK_WIDGET_MAPPED (child)) gtk_widget_map (child); } - - if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_VISIBLE (table)) - gtk_widget_queue_resize (child); } void --- 536,551 ---- gtk_widget_set_parent (child, GTK_WIDGET (table)); ! if (GTK_WIDGET_REALIZED (child->parent)) ! gtk_widget_realize (child); ! ! if (GTK_WIDGET_VISIBLE (child->parent) && GTK_WIDGET_VISIBLE (child)) { ! if (GTK_WIDGET_MAPPED (child->parent)) gtk_widget_map (child); + + gtk_widget_queue_resize (child); } } void Index: gtkvpaned.c =================================================================== RCS file: /home/cvs/src/ide/external/win32gtk/gtk+/gtk/gtkvpaned.c,v retrieving revision 1.1 retrieving revision 1.2 diff -c -r1.1 -r1.2 *** gtkvpaned.c 2001/01/03 00:08:13 1.1 --- gtkvpaned.c 2001/05/17 20:16:27 1.2 *************** *** 34,40 **** GtkAllocation *allocation); static void gtk_vpaned_draw (GtkWidget *widget, GdkRectangle *area); ! static void gtk_vpaned_xor_line (GtkPaned *paned); static gboolean gtk_vpaned_button_press (GtkWidget *widget, GdkEventButton *event); static gboolean gtk_vpaned_button_release (GtkWidget *widget, --- 34,40 ---- GtkAllocation *allocation); static void gtk_vpaned_draw (GtkWidget *widget, GdkRectangle *area); ! /*static void gtk_vpaned_xor_line (GtkPaned *paned);*/ static gboolean gtk_vpaned_button_press (GtkWidget *widget, GdkEventButton *event); static gboolean gtk_vpaned_button_release (GtkWidget *widget, *************** *** 274,310 **** } } ! static void ! gtk_vpaned_xor_line (GtkPaned *paned) ! { ! GtkWidget *widget; ! GdkGCValues values; ! guint16 ypos; ! ! widget = GTK_WIDGET (paned); ! ! if (!paned->xor_gc) ! { ! values.function = GDK_INVERT; ! values.subwindow_mode = GDK_INCLUDE_INFERIORS; ! paned->xor_gc = gdk_gc_new_with_values (widget->window, ! &values, ! GDK_GC_FUNCTION | GDK_GC_SUBWINDOW); ! } ! ! gdk_gc_set_line_attributes (paned->xor_gc, 2, GDK_LINE_SOLID, ! GDK_CAP_NOT_LAST, GDK_JOIN_BEVEL); ! ! ypos = paned->child1_size ! + GTK_CONTAINER (paned)->border_width + paned->handle_size / 2; ! ! gdk_draw_line (widget->window, paned->xor_gc, ! 0, ! ypos, ! widget->allocation.width - 1, ! ypos); ! } ! static gboolean gtk_vpaned_button_press (GtkWidget *widget, GdkEventButton *event) --- 274,310 ---- } } ! /*static void*/ ! /*gtk_vpaned_xor_line (GtkPaned *paned)*/ ! /*{*/ ! /* GtkWidget *widget;*/ ! /* GdkGCValues values;*/ ! /* guint16 ypos;*/ ! /**/ ! /* widget = GTK_WIDGET (paned);*/ ! /**/ ! /* if (!paned->xor_gc)*/ ! /* {*/ ! /* values.function = GDK_INVERT;*/ ! /* values.subwindow_mode = GDK_INCLUDE_INFERIORS;*/ ! /* paned->xor_gc = gdk_gc_new_with_values (widget->window,*/ ! /* &values,*/ ! /* GDK_GC_FUNCTION | GDK_GC_SUBWINDOW);*/ ! /* }*/ ! /**/ ! /* gdk_gc_set_line_attributes (paned->xor_gc, 2, GDK_LINE_SOLID,*/ ! /* GDK_CAP_NOT_LAST, GDK_JOIN_BEVEL);*/ ! /**/ ! /* ypos = paned->child1_size*/ ! /* + GTK_CONTAINER (paned)->border_width + paned->handle_size / 2;*/ ! /**/ ! /* gdk_draw_line (widget->window, paned->xor_gc,*/ ! /* 0,*/ ! /* ypos,*/ ! /* widget->allocation.width - 1,*/ ! /* ypos);*/ ! /*}*/ ! /**/ static gboolean gtk_vpaned_button_press (GtkWidget *widget, GdkEventButton *event) *************** *** 332,339 **** widget->allocation.height - paned->handle_size - 2 * GTK_CONTAINER (paned)->border_width); ! gtk_vpaned_xor_line(paned); ! return TRUE; } --- 332,340 ---- widget->allocation.height - paned->handle_size - 2 * GTK_CONTAINER (paned)->border_width); ! /* gtk_vpaned_xor_line(paned);*/ ! gtk_widget_queue_resize (GTK_WIDGET (paned)); ! return TRUE; } *************** *** 353,359 **** if (paned->in_drag && (event->button == 1)) { ! gtk_vpaned_xor_line (paned); paned->in_drag = FALSE; paned->position_set = TRUE; gdk_pointer_ungrab (event->time); --- 354,360 ---- if (paned->in_drag && (event->button == 1)) { ! /* gtk_vpaned_xor_line (paned);*/ paned->in_drag = FALSE; paned->position_set = TRUE; gdk_pointer_ungrab (event->time); *************** *** 386,394 **** { gint size = y - GTK_CONTAINER(paned)->border_width - paned->handle_size / 2; ! gtk_vpaned_xor_line (paned); paned->child1_size = CLAMP (size, paned->min_position, paned->max_position); ! gtk_vpaned_xor_line(paned); } return TRUE; --- 387,396 ---- { gint size = y - GTK_CONTAINER(paned)->border_width - paned->handle_size / 2; ! /* gtk_vpaned_xor_line (paned);*/ paned->child1_size = CLAMP (size, paned->min_position, paned->max_position); ! /* gtk_vpaned_xor_line(paned);*/ ! gtk_widget_queue_resize (GTK_WIDGET (paned)); } return TRUE; Index: makefile.msc =================================================================== RCS file: /home/cvs/src/ide/external/win32gtk/gtk+/gtk/makefile.msc,v retrieving revision 1.1 retrieving revision 1.4 diff -c -r1.1 -r1.4 *** makefile.msc 2001/01/03 00:08:13 1.1 --- makefile.msc 2001/05/07 21:28:33 1.4 *************** *** 312,353 **** # # Generated source files: # ! generated : gtk.defs gtktypebuiltins.h gtktypebuiltins_vars.c gtktypebuiltins_ids.c gtktypebuiltins_evals.c gtkmarshal.h gtkmarshal.c ! $(TOUCH) generated ! gtk.defs : makeenums.pl gtk-boxed.defs $(source_headers) $(gdk_headers) ! $(PERL) makeenums.pl defs $(source_headers) $(gdk_headers) >gd.tmp ! copy gd.tmp+gtk-boxed.defs gtk.defs ! @erase gd.tmp # generate type identifier header (GTK_TYPE_WIDGET_FLAGS) ! gtktypebuiltins.h: gtk.defs maketypes.awk ! $(AWK) -f maketypes.awk gtk.defs macros >gtktypebuiltins.h # generate type identifier variables (GTK_TYPE_WIDGET_FLAGS) ! gtktypebuiltins_vars.c: gtk.defs maketypes.awk ! $(AWK) -f maketypes.awk gtk.defs variables >gtktypebuiltins_vars.c # generate type entries for type-id registration ! gtktypebuiltins_ids.c: gtk.defs maketypes.awk ! $(AWK) -f maketypes.awk gtk.defs entries >gtktypebuiltins_ids.c # generate enum value arrays ! gtktypebuiltins_evals.c: makeenums.pl gtk.defs ! $(PERL) makeenums.pl arrays $(source_headers) $(gdk_headers) >gtktypebuiltins_evals.c ! gtkmarshal.h gtkmarshal.c : gtkmarshal.list genmarshal.pl ! $(PERL) genmarshal.pl ! del gtkmarshal.c ! rename s-gmc gtkmarshal.c ! del gtkmarshal.h ! rename s-gmh gtkmarshal.h # # Linking: # gtk-$(GTK_VER).dll : $(gtk_OBJECTS) gtk.def ! $(CC) $(CFLAGS) -LD -Fegtk-$(GTK_VER).dll $(gtk_OBJECTS) ..\gdk\gdk-$(GTK_VER).lib $(INTL)\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(GLIB)\gmodule-$(GLIB_VER).lib gdi32.lib user32.lib advapi32.lib $(LDFLAGS) /def:gtk.def # General rule for compiling the objects into the DLL .c.obj : --- 312,353 ---- # # Generated source files: # ! #generated : gtk.defs gtktypebuiltins.h gtktypebuiltins_vars.c gtktypebuiltins_ids.c gtktypebuiltins_evals.c gtkmarshal.h gtkmarshal.c ! # $(TOUCH) generated ! #gtk.defs : makeenums.pl gtk-boxed.defs $(source_headers) $(gdk_headers) ! # $(PERL) makeenums.pl defs $(source_headers) $(gdk_headers) >gd.tmp ! # copy gd.tmp+gtk-boxed.defs gtk.defs ! # @erase gd.tmp # generate type identifier header (GTK_TYPE_WIDGET_FLAGS) ! #gtktypebuiltins.h: gtk.defs maketypes.awk ! # $(AWK) -f maketypes.awk gtk.defs macros >gtktypebuiltins.h # generate type identifier variables (GTK_TYPE_WIDGET_FLAGS) ! #gtktypebuiltins_vars.c: gtk.defs maketypes.awk ! # $(AWK) -f maketypes.awk gtk.defs variables >gtktypebuiltins_vars.c # generate type entries for type-id registration ! #gtktypebuiltins_ids.c: gtk.defs maketypes.awk ! # $(AWK) -f maketypes.awk gtk.defs entries >gtktypebuiltins_ids.c # generate enum value arrays ! #gtktypebuiltins_evals.c: makeenums.pl gtk.defs ! # $(PERL) makeenums.pl arrays $(source_headers) $(gdk_headers) >gtktypebuiltins_evals.c ! #gtkmarshal.h gtkmarshal.c : gtkmarshal.list genmarshal.pl ! # $(PERL) genmarshal.pl ! # -del gtkmarshal.c ! # rename s-gmc gtkmarshal.c ! # -del gtkmarshal.h ! # rename s-gmh gtkmarshal.h # # Linking: # gtk-$(GTK_VER).dll : $(gtk_OBJECTS) gtk.def ! $(CC) $(CFLAGS) -LD -Fegtk-$(GTK_VER).dll $(gtk_OBJECTS) ..\gdk\gdk-$(GTK_VER).lib $(INTL)\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(GLIB)\gmodule\gmodule-$(GLIB_VER).lib gdi32.lib user32.lib advapi32.lib $(LDFLAGS) /def:gtk.def # General rule for compiling the objects into the DLL .c.obj : *************** *** 401,415 **** # The clean target doesn't remove the generated sources clean: ! del *.exe ! del *.obj ! del *.dll ! del *.lib ! del *.exp ! del *.err ! del *.map ! del *.sym ! del *.lk1 ! del *.mk1 ! del *.pdb ! del *.ilk --- 401,415 ---- # The clean target doesn't remove the generated sources clean: ! -del *.exe ! -del *.obj ! -del *.dll ! -del *.lib ! -del *.exp ! -del *.err ! -del *.map ! -del *.sym ! -del *.lk1 ! -del *.mk1 ! -del *.pdb ! -del *.ilk