Mercurial > dwindows
changeset 523:b2065b0c39c1
Minor MDI fixes, tried to fix the y-axis problem for OS/2 boxes but it is
a bit more complex than I originally thought.
| author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
|---|---|
| date | Tue, 16 Mar 2004 10:47:23 +0000 |
| parents | 29547598b909 |
| children | 55c9fa60af78 |
| files | dwtest.c os2/dw.c |
| diffstat | 2 files changed, 10 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/dwtest.c Tue Mar 16 08:23:04 2004 +0000 +++ b/dwtest.c Tue Mar 16 10:47:23 2004 +0000 @@ -811,7 +811,7 @@ void mdi_add(void) { - HWND mdibox, mdi, mdi1w, ef, mdi2w, mdi2box, bb; + HWND mdibox, mdi, mdi1w, mdi1box, ef, mdi2w, mdi2box, bb; /* create a box to pack into the notebook page */ mdibox = dw_box_new(DW_HORZ, 0); @@ -823,8 +823,10 @@ dw_box_pack_start(mdibox, mdi, 500, 200, TRUE, TRUE, 2); mdi1w = dw_window_new(mdi, "MDI1", flStyle | DW_FCF_SIZEBORDER | DW_FCF_MINMAX); + mdi1box = dw_box_new(DW_HORZ, 0); + dw_box_pack_start(mdi1w, mdi1box, 0, 0, TRUE, TRUE, 0); ef = dw_entryfield_new("", 0); - dw_box_pack_start(mdi1w, ef, 100, 15, FALSE, FALSE, 4); + dw_box_pack_start(mdi1box, ef, 100, 20, FALSE, FALSE, 4); dw_window_set_size(mdi1w, 200, 100); dw_window_show(mdi1w); @@ -834,7 +836,7 @@ ef = dw_entryfield_new( "", 0); dw_box_pack_start(mdi2box, ef, 150, 30, FALSE, FALSE, 4); bb = dw_button_new("Browse", 0); - dw_box_pack_start(mdi2box, bb, 60, 30, FALSE, FALSE, 0); + dw_box_pack_start(mdi2box, bb, 60, 30, FALSE, FALSE, 4); dw_window_set_size(mdi2w, 200, 100); dw_window_show(mdi2w); dw_window_set_pos(mdi2w, 200, 200);
--- a/os2/dw.c Tue Mar 16 08:23:04 2004 +0000 +++ b/os2/dw.c Tue Mar 16 10:47:23 2004 +0000 @@ -3975,8 +3975,8 @@ HWND API dw_mdi_new(unsigned long id) { HWND hwndframe; - - id = id; /* keep compiler happy */ + ULONG back = CLR_DARKGRAY; + hwndframe = WinCreateWindow(HWND_OBJECT, WC_FRAME, NULL, @@ -3985,9 +3985,11 @@ 0,0,2000,1000, NULLHANDLE, HWND_TOP, - 0L, + id, NULL, NULL); + /* Make the MDI Client area the same color as Windows and Unix */ + WinSetPresParam(hwndframe, PP_BACKGROUNDCOLORINDEX, sizeof(ULONG), &back); return hwndframe; }