# HG changeset patch # User bsmith@81767d24-ef19-dc11-ae90-00e081727c95 # Date 1322730249 0 # Node ID 93eb987c05cff91424a36401cdfa2278b27648b4 # Parent 96460bd4c6791af5409662ddf35801854d35719f Same basic groupbox fix for OS/2. diff -r 96460bd4c679 -r 93eb987c05cf os2/dw.c --- a/os2/dw.c Thu Dec 01 08:51:05 2011 +0000 +++ b/os2/dw.c Thu Dec 01 09:04:09 2011 +0000 @@ -1060,13 +1060,19 @@ { char *text = dw_window_get_text(thisbox->grouphwnd); - thisbox->grouppady = 0; + thisbox->grouppady = 9; if(text) { - dw_font_text_extents_get(thisbox->grouphwnd, 0, text, NULL, &thisbox->grouppady); + if(*text) + dw_font_text_extents_get(thisbox->grouphwnd, 0, text, NULL, &thisbox->grouppady); dw_free(text); } + /* If the string height is less than 9... + * set it to 9 anyway since that is the minimum. + */ + if(thisbox->grouppady < 9) + thisbox->grouppady = 9; if(thisbox->grouppady) thisbox->grouppady += 3; diff -r 96460bd4c679 -r 93eb987c05cf win/dw.c --- a/win/dw.c Thu Dec 01 08:51:05 2011 +0000 +++ b/win/dw.c Thu Dec 01 09:04:09 2011 +0000 @@ -1144,7 +1144,6 @@ else thisbox->grouppady = 6; - dw_debug("grouppady %d\n", thisbox->grouppady); thisbox->grouppadx = 6; (*usedx) += thisbox->grouppadx;