Mercurial > dwindows
changeset 148:830f591c87f1
dw_window_set_usize fixes and fallback to "fixed" on GTK 1.2 if pango
font doesn't load.
| author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
|---|---|
| date | Wed, 23 Oct 2002 16:23:06 +0000 |
| parents | b479002e013f |
| children | 6028f787f7c8 |
| files | gtk/dw.c |
| diffstat | 1 files changed, 18 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/gtk/dw.c Wed Oct 23 14:34:29 2002 +0000 +++ b/gtk/dw.c Wed Oct 23 16:23:06 2002 +0000 @@ -4716,6 +4716,8 @@ } #else font = gdk_font_load(fontname); + if(!font) + font = gdk_font_load("fixed"); if(font) { gint ascent; @@ -4789,6 +4791,8 @@ #else font = gdk_font_load(fontname ? fontname : "fixed"); + if(!font) + font = gdk_font_load("fixed"); if(font) { if(width) @@ -5290,13 +5294,18 @@ { int _locked_by_me = FALSE; + if(!handle) + return; + DW_MUTEX_LOCK; if(GTK_IS_WINDOW(handle)) + { _size_allocate(GTK_WINDOW(handle)); -#if 0 - gtk_window_set_default_size(GTK_WINDOW(handle), width, height); + if(handle->window) + gdk_window_resize(handle->window, width - _dw_border_width, height - _dw_border_height); + gtk_window_set_default_size(GTK_WINDOW(handle), width - _dw_border_width, height - _dw_border_height); + } else -#endif gtk_widget_set_usize(handle, width, height); DW_MUTEX_UNLOCK; } @@ -5371,8 +5380,11 @@ { int _locked_by_me = FALSE; - DW_MUTEX_LOCK; - if(handle && GTK_IS_WINDOW(handle)) + if(!handle) + return; + + DW_MUTEX_LOCK; + if(GTK_IS_WINDOW(handle)) { _size_allocate(GTK_WINDOW(handle)); @@ -5381,7 +5393,7 @@ gdk_window_resize(handle->window, width - _dw_border_width, height - _dw_border_height); gtk_window_set_default_size(GTK_WINDOW(handle), width - _dw_border_width, height - _dw_border_height); } - else if(handle && handle->window) + else if(handle->window) { gdk_window_resize(handle->window, width, height); gdk_window_move(handle->window, x, y);