From: <kr_...@us...> - 2003-03-24 17:07:42
|
Update of /cvsroot/htoolkit/port/src/cbits/GTK In directory sc8-pr-cvs1:/tmp/cvs-serv19196/src/cbits/GTK Modified Files: CheckBox.c ListBox.c PopUp.c RadioBox.c Log Message: Merge PopUpClick, CheckBoxClick, RadioBoxClick, ListBoxClick and ButtonClick to single event named ControlCommand Index: CheckBox.c =================================================================== RCS file: /cvsroot/htoolkit/port/src/cbits/GTK/CheckBox.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CheckBox.c 10 Feb 2003 22:42:09 -0000 1.3 --- CheckBox.c 24 Mar 2003 17:07:08 -0000 1.4 *************** *** 11,15 **** gtk_fixed_put(GTK_FIXED(GTK_BIN(GetSW(window)->child)->child), check_btn, 0, 0); gtk_signal_connect (GTK_OBJECT (check_btn), "toggled", ! GTK_SIGNAL_FUNC(handleCheckBoxClick), NULL); gtk_widget_show(check_btn); --- 11,15 ---- gtk_fixed_put(GTK_FIXED(GTK_BIN(GetSW(window)->child)->child), check_btn, 0, 0); gtk_signal_connect (GTK_OBJECT (check_btn), "toggled", ! GTK_SIGNAL_FUNC(handleControlCommand), NULL); gtk_widget_show(check_btn); Index: ListBox.c =================================================================== RCS file: /cvsroot/htoolkit/port/src/cbits/GTK/ListBox.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ListBox.c 10 Feb 2003 22:42:09 -0000 1.3 --- ListBox.c 24 Mar 2003 17:07:09 -0000 1.4 *************** *** 6,10 **** { printf("1\n"); ! handleListBoxClick(w); } --- 6,10 ---- { printf("1\n"); ! handleControlCommand(w); } *************** *** 12,16 **** { printf("2 -> %08X %08X\n", w1, w2); ! handleListBoxClick(w1); } --- 12,16 ---- { printf("2 -> %08X %08X\n", w1, w2); ! handleControlCommand(w1); } *************** *** 18,22 **** { printf("3 -> %08X %08X\n", w1, w2); ! handleListBoxClick(w1); } --- 18,22 ---- { printf("3 -> %08X %08X\n", w1, w2); ! handleControlCommand(w1); } *************** *** 53,57 **** { printf("hh\n"); ! handleListBoxClick((GtkWidget *) user_data); }; --- 53,57 ---- { printf("hh\n"); ! handleControlCommand((GtkWidget *) user_data); }; Index: PopUp.c =================================================================== RCS file: /cvsroot/htoolkit/port/src/cbits/GTK/PopUp.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PopUp.c 10 Feb 2003 22:42:09 -0000 1.3 --- PopUp.c 24 Mar 2003 17:07:09 -0000 1.4 *************** *** 5,9 **** static void handleLBoxClick(GtkList *list, gpointer user_data) { ! handlePopUpClick((GtkWidget *) user_data); }; --- 5,9 ---- static void handleLBoxClick(GtkList *list, gpointer user_data) { ! handleControlCommand((GtkWidget *) user_data); }; Index: RadioBox.c =================================================================== RCS file: /cvsroot/htoolkit/port/src/cbits/GTK/RadioBox.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RadioBox.c 10 Feb 2003 22:42:09 -0000 1.3 --- RadioBox.c 24 Mar 2003 17:07:09 -0000 1.4 *************** *** 21,25 **** gtk_fixed_put(GTK_FIXED(GTK_BIN(GetSW(window)->child)->child), radio_btn, 0, 0); gtk_signal_connect (GTK_OBJECT (radio_btn), "toggled", ! GTK_SIGNAL_FUNC(handleRadioBoxClick), NULL); gtk_widget_show(radio_btn); --- 21,25 ---- gtk_fixed_put(GTK_FIXED(GTK_BIN(GetSW(window)->child)->child), radio_btn, 0, 0); gtk_signal_connect (GTK_OBJECT (radio_btn), "toggled", ! GTK_SIGNAL_FUNC(handleControlCommand), NULL); gtk_widget_show(radio_btn); |