From petm@scam.XCF.Berkeley.EDU Sat Apr 19 11:25:13 1997
Date: Fri, 18 Apr 1997 22:17:14 -0700
From: Peter Mattis <petm@scam.XCF.Berkeley.EDU>
To: GIMP Developers <gimp-developer@scam.XCF.Berkeley.EDU>
Subject: Re: [gimp-devel] patch: 0.99.8 - portability down the drain again 


>gtk+/gtk/gtktext.c does this:
>
>#define ETRACE(format, args...)

Here is patch to fix this.

Peter

*** gtktext.c.orig	Fri Apr 18 02:08:56 1997
--- gtktext.c	Fri Apr 18 22:13:47 1997
***************
*** 251,259 ****
  
  /*#define DEBUG_GTK_TEXT*/
  #if defined(DEBUG_GTK_TEXT)
! #define ETRACE(format, args...) g_print (format, ## args)
  #else
! #define ETRACE(format, args...)
  #endif
  
  #if defined(DEBUG_GTK_TEXT) && defined(__GNUC__)
--- 251,259 ----
  
  /*#define DEBUG_GTK_TEXT*/
  #if defined(DEBUG_GTK_TEXT)
! #define ETRACE(args) g_print args
  #else
! #define ETRACE(args)
  #endif
  
  #if defined(DEBUG_GTK_TEXT) && defined(__GNUC__)
***************
*** 703,709 ****
  
    if (GTK_WIDGET_DRAWABLE (widget))
      {
!       ETRACE ("in gtk_text_draw_focus\n");
  
        x = 0;
        y = 0;
--- 703,709 ----
  
    if (GTK_WIDGET_DRAWABLE (widget))
      {
!       ETRACE (("in gtk_text_draw_focus\n"));
  
        x = 0;
        y = 0;
***************
*** 739,745 ****
      }
    else
      {
!       ETRACE ("in gtk_text_draw_focus (undrawable !!!)\n");
      }
  }
  
--- 739,745 ----
      }
    else
      {
!       ETRACE (("in gtk_text_draw_focus (undrawable !!!)\n"));
      }
  }
  
***************
*** 812,823 ****
  
    if (event->window == GTK_TEXT (widget)->text_area)
      {
!       ETRACE ("in gtk_text_expose (expose)\n");
        expose (GTK_TEXT (widget), &event->area, TRUE);
      }
    else if (event->count == 0)
      {
!       ETRACE ("in gtk_text_expose (focus)\n");
        gtk_widget_draw_focus (widget);
      }
  
--- 812,823 ----
  
    if (event->window == GTK_TEXT (widget)->text_area)
      {
!       ETRACE (("in gtk_text_expose (expose)\n"));
        expose (GTK_TEXT (widget), &event->area, TRUE);
      }
    else if (event->count == 0)
      {
!       ETRACE (("in gtk_text_expose (focus)\n"));
        gtk_widget_draw_focus (widget);
      }
  
***************
*** 1005,1011 ****
    g_return_val_if_fail (GTK_IS_TEXT (widget), FALSE);
    g_return_val_if_fail (event != NULL, FALSE);
  
!   ETRACE ("in gtk_text_focus_in\n");
  
    GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
    gtk_widget_draw_focus (widget);
--- 1005,1011 ----
    g_return_val_if_fail (GTK_IS_TEXT (widget), FALSE);
    g_return_val_if_fail (event != NULL, FALSE);
  
!   ETRACE (("in gtk_text_focus_in\n"));
  
    GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
    gtk_widget_draw_focus (widget);
***************
*** 1023,1029 ****
    g_return_val_if_fail (GTK_IS_TEXT (widget), FALSE);
    g_return_val_if_fail (event != NULL, FALSE);
  
!   ETRACE ("in gtk_text_focus_out\n");
  
    GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
    gtk_widget_draw_focus (widget);
--- 1023,1029 ----
    g_return_val_if_fail (GTK_IS_TEXT (widget), FALSE);
    g_return_val_if_fail (event != NULL, FALSE);
  
!   ETRACE (("in gtk_text_focus_out\n"));
  
    GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
    gtk_widget_draw_focus (widget);
***************
*** 2895,2901 ****
  static void
  undraw_cursor (GtkText* text)
  {
!   ETRACE ("in undraw_cursor\n");
  
    if (text->has_cursor)
      {
--- 2895,2901 ----
  static void
  undraw_cursor (GtkText* text)
  {
!   ETRACE (("in undraw_cursor\n"));
  
    if (text->has_cursor)
      {
***************
*** 2967,2973 ****
  static void
  draw_cursor (GtkText* text)
  {
!   ETRACE ("in draw_cursor\n");
  
    if (text->has_cursor)
      {
--- 2967,2973 ----
  static void
  draw_cursor (GtkText* text)
  {
!   ETRACE (("in draw_cursor\n"));
  
    if (text->has_cursor)
      {
***************
*** 2998,3004 ****
    gdk_window_get_size (text->text_area, NULL, &height);
    max_y = MIN (max_y, height);
  
!   ETRACE ("in expose x=%d y=%d w=%d h=%d\n", area->x, area->y, area->width, area->height);
  
    gdk_window_clear_area (text->text_area,
  			 area->x, area->y, area->width, MIN(height, area->height));
--- 2998,3004 ----
    gdk_window_get_size (text->text_area, NULL, &height);
    max_y = MIN (max_y, height);
  
!   ETRACE (("in expose x=%d y=%d w=%d h=%d\n", area->x, area->y, area->width, area->height));
  
    gdk_window_clear_area (text->text_area,
  			 area->x, area->y, area->width, MIN(height, area->height));