Update of /cvsroot/htoolkit/port/src/cbits/GTK
In directory sc8-pr-cvs1:/tmp/cvs-serv6624/src/cbits/GTK
Modified Files:
Button.c Label.c
Log Message:
bugfix
Index: Button.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/GTK/Button.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Button.c 29 Mar 2003 08:12:17 -0000 1.6
--- Button.c 2 Apr 2003 21:10:16 -0000 1.7
***************
*** 40,44 ****
{
gchar *szText = toMnemonicString(txt);
! GtkWidget *window = gtk_widget_get_toplevel(button);
gtk_button_set_label(GTK_BUTTON(button), szText);
handleWindowReLayout(window);
--- 40,44 ----
{
gchar *szText = toMnemonicString(txt);
! GtkWidget *window = gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(button)));
gtk_button_set_label(GTK_BUTTON(button), szText);
handleWindowReLayout(window);
***************
*** 48,52 ****
void osChangeButtonFont(WindowHandle button, FontHandle font)
{
gtk_widget_modify_font(button, font->font_descr);
! handleWindowReLayout(gtk_widget_get_toplevel(button));
};
--- 48,53 ----
void osChangeButtonFont(WindowHandle button, FontHandle font)
{
+ GtkWidget *window = gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(button)));
gtk_widget_modify_font(button, font->font_descr);
! handleWindowReLayout(window);
};
Index: Label.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/GTK/Label.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Label.c 29 Mar 2003 08:12:18 -0000 1.5
--- Label.c 2 Apr 2003 21:10:18 -0000 1.6
***************
*** 38,42 ****
{
gchar *szText = toMnemonicString(txt);
! GtkWidget *window = gtk_widget_get_toplevel(label);
gtk_label_set_text_with_mnemonic(GTK_LABEL(label), szText);
handleWindowReLayout(window);
--- 38,42 ----
{
gchar *szText = toMnemonicString(txt);
! GtkWidget *window = gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(label)));
gtk_label_set_text_with_mnemonic(GTK_LABEL(label), szText);
handleWindowReLayout(window);
***************
*** 46,51 ****
void osChangeLabelFont(WindowHandle label, FontHandle font)
{
gtk_widget_modify_font(label, font->font_descr);
//pango_layout_set_font_description(gtk_label_get_layout(GTK_LABEL(label)), font->font_descr);
! handleWindowReLayout(gtk_widget_get_toplevel(label));
};
--- 46,52 ----
void osChangeLabelFont(WindowHandle label, FontHandle font)
{
+ GtkWidget *window = gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(label)));
gtk_widget_modify_font(label, font->font_descr);
//pango_layout_set_font_description(gtk_label_get_layout(GTK_LABEL(label)), font->font_descr);
! handleWindowReLayout(window);
};
|
