Old stuff that didn't get commited. (owt)

* gtk/gtkinputdialog.h (struct _GtkInputDialogClass):
	  removed 'gpointer data' arguments from default handler
	  structures.


	* gtk/gtktreeitem.[ch]: Keep track of separate +/- pixmaps
	  for each colormap, removed the idle hack.

	* testglib.c: Remove trailing ; after functions

 ----------------------------------------------------------------------
This commit is contained in:
Owen Taylor 1998-03-05 06:46:41 +00:00
parent ba55b3f94b
commit 1ac59c103d
3 changed files with 19 additions and 6 deletions

View File

@ -15,6 +15,7 @@
* License along with this library; if not, write to the Free
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <stdio.h>
#include <string.h>
#include "glib.h"
@ -49,7 +50,7 @@ my_list_compare_one (gpointer a, gpointer b)
gint one = *((gint*)a);
gint two = *((gint*)b);
return one-two;
};
}
gint
my_list_compare_two (gpointer a, gpointer b)
@ -57,7 +58,7 @@ my_list_compare_two (gpointer a, gpointer b)
gint one = *((gint*)a);
gint two = *((gint*)b);
return two-one;
};
}
/* void
my_list_print (gpointer a, gpointer b)
@ -86,6 +87,14 @@ my_traverse (gpointer key,
return FALSE;
}
void
print_compare (gchar *a,
gchar *b)
{
g_print ("%s <=> %s : %d\n", a, b, g_strcasecmp(a,b));
g_print ("%s <=> %s : %d\n", b, a, g_strcasecmp(b,a));
}
int
main (int argc,
char *argv[])
@ -386,6 +395,10 @@ main (int argc,
g_print ("ok\n");
g_print ("checking g_strcasecmp...\n");
print_compare ("Schlo<EFBFBD>ß", "Schlo");
print_compare ("<EFBFBD>Äffchen", "<EFBFBD>Öfchen");
/* g_debug (argv[0]); */

View File

@ -59,11 +59,9 @@ struct _GtkInputDialogClass
GtkWindowClass parent_class;
void (* enable_device) (GtkInputDialog *inputd,
guint32 devid,
gpointer *data);
guint32 devid);
void (* disable_device) (GtkInputDialog *inputd,
guint32 devid,
gpointer *data);
guint32 devid);
};

View File

@ -45,6 +45,8 @@ struct _GtkTreeItem
GtkWidget *pixmaps_box;
GtkWidget *plus_pix_widget, *minus_pix_widget;
GList *pixmaps; /* pixmap node for this items color depth */
guint expanded : 1;
};