[gq-commit] gq/src mainwin.c,1.49,1.50 utf8-compat.h,1.3,1.4

[<sta...@us...>]

Update of /cvsroot/gqclient/gq/src
In directory sc8-pr-cvs1:/tmp/cvs-serv9663

Modified Files:
	mainwin.c utf8-compat.h 
Log Message:
* gtk 1.x fixes


Index: mainwin.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/mainwin.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** mainwin.c	20 Oct 2003 08:10:29 -0000	1.49
--- mainwin.c	21 Oct 2003 04:53:50 -0000	1.50
***************
*** 291,295 ****
  	  gtk_editable_insert_text(GTK_EDITABLE(mainwin.ml_text), buf, 
  				   strlen(buf), &pos);
! 	  gtk_editable_insert_text(GTK_EDITABLE(mainwin.ml_text), "\n", 1, &pos)
  #endif
       }
--- 291,296 ----
  	  gtk_editable_insert_text(GTK_EDITABLE(mainwin.ml_text), buf, 
  				   strlen(buf), &pos);
! 	  gtk_editable_insert_text(GTK_EDITABLE(mainwin.ml_text), "\n", 
! 				   1, &pos);
  #endif
       }
***************
*** 371,376 ****
--- 372,379 ----
  				    GTK_POLICY_AUTOMATIC,
  				    GTK_POLICY_AUTOMATIC);
+ #if GTK_MAJOR >= 2
       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrwin),
  					 GTK_SHADOW_IN);
+ #endif
       gtk_box_pack_start(GTK_BOX(vbox0), scrwin, TRUE, TRUE, 0);
  
***************
*** 384,388 ****
  #else
       text = gtk_text_new(NULL, NULL);
!      gtk_text_set_editable(GTK_TEXT(inputbox), FALSE);
  #endif
  
--- 387,391 ----
  #else
       text = gtk_text_new(NULL, NULL);
!      gtk_text_set_editable(GTK_TEXT(text), FALSE);
  #endif
  
***************
*** 400,404 ****
  	  gtk_editable_insert_text(GTK_EDITABLE(text), I->data, 
  				   strlen(I->data), &pos);
! 	  gtk_editable_insert_text(GTK_EDITABLE(text), "\n", 1, &pos)
  #endif
       }
--- 403,407 ----
  	  gtk_editable_insert_text(GTK_EDITABLE(text), I->data, 
  				   strlen(I->data), &pos);
! 	  gtk_editable_insert_text(GTK_EDITABLE(text), "\n", 1, &pos);
  #endif
       }
***************
*** 918,922 ****
  #if GTK_MAJOR < 2
       hbox = gtk_hbox_new(FALSE, 0);
!      gtk_container_border_width(GTK_CONTAINER(hbox), CONTAINER_BORDER_WIDTH);
       gtk_widget_show(hbox);
       gtk_box_pack_start(GTK_BOX(vbox1), hbox, TRUE, TRUE, 0);
--- 921,925 ----
  #if GTK_MAJOR < 2
       hbox = gtk_hbox_new(FALSE, 0);
! /*      gtk_container_border_width(GTK_CONTAINER(hbox), CONTAINER_BORDER_WIDTH); */
       gtk_widget_show(hbox);
       gtk_box_pack_start(GTK_BOX(vbox1), hbox, TRUE, TRUE, 0);

Index: utf8-compat.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/utf8-compat.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** utf8-compat.h	16 Oct 2003 21:30:05 -0000	1.3
--- utf8-compat.h	21 Oct 2003 04:53:50 -0000	1.4
***************
*** 36,39 ****
--- 36,42 ----
  #   define g_utf8_get_char(p)  (*(p))
  #   define g_utf8_next_char(p) (((char*)(p))+1)
+ #   define g_unichar_isdigit(c) isdigit(c)
+ #   define g_string_append_unichar(s,c) g_string_append_c((s),(c))
+ #   define g_strcompress(x) g_strdup(x)
  #else
  #   include <glib/gunicode.h>