Re-enable the "find" dialog

2000-10-23  Havoc Pennington  <hp@redhat.com>

        * gtk/testtext.c: Re-enable the "find" dialog

	* gtk/testgtk.c: Add test for gdk_drawable_get_image

	* gdk/gdkwindow.c (gdk_window_begin_paint_region): Fix bug where
	the arguments to gdk_draw_drawable were in the wrong order
	(gdk_window_paint_init_bg): This function was ignoring the
	init_region, instead of clipping to it, so the entire backing
	pixmap was cleared on every begin_paint()
	(gdk_window_begin_paint_region): Hmm, the same list-walking bug
	was in here again, the loop kept using the same GtkWindowPaint
	over and over.
	(gdk_window_begin_paint_region): Fix a bug where we had two
	x_offset instead of x_offset and y_offset

	* gdk/gdkdraw.c (gdk_drawable_get_image): get composite drawable
	before we get the image.
	(gdk_draw_drawable): get the composite before we draw the drawable.
	(gdk_drawable_real_get_composite_drawable): default
	get_composite_drawable implementation that returns the drawable
	itself

	* gdk/gdkdrawable.h (struct _GdkDrawableClass ): Add
	get_composite_drawable virtual function

	* gdk/gdkwindow.c (gdk_window_begin_paint_region): Fix a cheesy
	list-walking bug

	* gdk/x11/gdkdrawable-x11.c (gdk_x11_draw_drawable): Add a hack to
	make this work if the source drawable is a GdkDrawableImplX11
	instead of a public drawable type. This is really broken; the
	problem is that GdkDrawable needs a virtual method get_xid(), but
	of course that doesn't work in practice. Enter RTTI.

	Also, improve mismatched depth message.

	* gdk/gdkpixmap.c (gdk_pixmap_get_image): Implement get_image for
	GdkPixmap

	* gdk/x11/gdkdrawable-x11.c (gdk_drawable_impl_x11_class_init):
	install _gdk_x11_get_image as our implementation of get_image

	* gdk/x11/gdkimage-x11.c (gdk_image_get): Rename to
	_gdk_x11_get_image and export for use in gdkdrawable-x11.c

	* gdk/gdkimage.c (gdk_image_get): Make this just a wrapper around
	gdk_drawable_get_image

	* gdk/gdkdraw.c (gdk_drawable_get_image): call virtual get_image

	* gdk/gdkdrawable.h (struct _GdkDrawableClass ): Virtualize
	get_image

	* gtk/gtktreestore.c (gtk_tree_store_get_node): remove weird
	trailing semicolon after for loop

1 files changed, 4 insertions, 6 deletions

diff --git a/tests/testtext.c b/tests/testtext.c
index a362fd9be1..d813d6fed4 100644
--- a/tests/testtext.c
+++ b/tests/testtext.c
@@ -954,14 +954,13 @@ do_search (gpointer callback_data,
   GtkWidget *search_text;
   GtkTextBuffer *buffer;
 
-#if 0
-  
   dialog = gtk_dialog_new_with_buttons ("Search",
                                         GTK_WINDOW (view->window),
                                         GTK_DIALOG_DESTROY_WITH_PARENT,
                                         GTK_STOCK_BUTTON_CLOSE,
                                         GTK_RESPONSE_NONE, NULL);
 
+
   buffer = gtk_text_buffer_new (NULL);
 
   /* FIXME memory leak once buffer is a GObject */
@@ -983,7 +982,6 @@ do_search (gpointer callback_data,
   gtk_widget_grab_focus (search_text);
   
   gtk_widget_show_all (dialog);
-#endif
 }
 
 static void
@@ -1300,6 +1298,7 @@ buffer_search_forward (Buffer *buffer, const char *str,
   GtkTextIter iter;
   GtkTextIter start, end;
   GtkWidget *dialog;
+  int i;
   
   /* remove tag from whole buffer */
   gtk_text_buffer_get_bounds (buffer->buffer, &start, &end);
@@ -1310,7 +1309,7 @@ buffer_search_forward (Buffer *buffer, const char *str,
                                     gtk_text_buffer_get_mark (buffer->buffer,
                                                               "insert"));
 
-
+  i = 0;
   if (*str != '\0')
     {
       GtkTextIter match_start, match_end;
@@ -1318,6 +1317,7 @@ buffer_search_forward (Buffer *buffer, const char *str,
       while (gtk_text_iter_forward_search (&iter, str, TRUE, FALSE,
                                            &match_start, &match_end))
         {
+          ++i;
           gtk_text_buffer_apply_tag (buffer->buffer, buffer->found_text_tag,
                                      &match_start, &match_end);
 
@@ -1325,7 +1325,6 @@ buffer_search_forward (Buffer *buffer, const char *str,
         }
     }
 
-#if 0  
   dialog = gtk_message_dialog_new (GTK_WINDOW (view->window),
                                    GTK_MESSAGE_INFO,
                                    GTK_BUTTONS_OK,
@@ -1339,7 +1338,6 @@ buffer_search_forward (Buffer *buffer, const char *str,
                              GTK_OBJECT (dialog));
   
   gtk_widget_show (dialog);
-#endif
 }
 
 static void