Mercurial > dwindows
comparison os2/dw.c @ 1455:a56fa83f2a7c
Remove forcing of items packed into toplevel windows to expand on OS/2.
Remove some obsolete function prototypes on OS/2.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Thu, 15 Dec 2011 11:17:25 +0000 |
parents | 632346743f46 |
children | 23f7fcc1c727 |
comparison
equal
deleted
inserted
replaced
1454:fb4a71126df5 | 1455:a56fa83f2a7c |
---|---|
58 MRESULT EXPENTRY _wndproc(HWND hWnd, ULONG msg, MPARAM mp1, MPARAM mp2); | 58 MRESULT EXPENTRY _wndproc(HWND hWnd, ULONG msg, MPARAM mp1, MPARAM mp2); |
59 MRESULT EXPENTRY _scrollwndproc(HWND hWnd, ULONG msg, MPARAM mp1, MPARAM mp2); | 59 MRESULT EXPENTRY _scrollwndproc(HWND hWnd, ULONG msg, MPARAM mp1, MPARAM mp2); |
60 void _do_resize(Box *thisbox, int x, int y); | 60 void _do_resize(Box *thisbox, int x, int y); |
61 void _handle_splitbar_resize(HWND hwnd, float percent, int type, int x, int y); | 61 void _handle_splitbar_resize(HWND hwnd, float percent, int type, int x, int y); |
62 int _load_bitmap_file(char *file, HWND handle, HBITMAP *hbm, HDC *hdc, HPS *hps, unsigned long *width, unsigned long *height); | 62 int _load_bitmap_file(char *file, HWND handle, HBITMAP *hbm, HDC *hdc, HPS *hps, unsigned long *width, unsigned long *height); |
63 void _dw_box_pack_start(HWND box, HWND item, int width, int height, int hsize, int vsize, int pad, char *functionname); | |
64 void _dw_box_pack_end(HWND box, HWND item, int width, int height, int hsize, int vsize, int pad, char *functionname); | |
65 void _free_menu_data(HWND menu); | 63 void _free_menu_data(HWND menu); |
66 ULONG (API_FUNC _PmPrintfString)(char *String) = 0; | 64 ULONG (API_FUNC _PmPrintfString)(char *String) = 0; |
67 | 65 |
68 char ClassName[] = "dynamicwindows"; | 66 char ClassName[] = "dynamicwindows"; |
69 char SplitbarClassName[] = "dwsplitbar"; | 67 char SplitbarClassName[] = "dwsplitbar"; |
1239 height = (int)(((float)height / (float)expandabley) * (float)(y - thisbox->usedpady)); | 1237 height = (int)(((float)height / (float)expandabley) * (float)(y - thisbox->usedpady)); |
1240 } | 1238 } |
1241 else | 1239 else |
1242 height = y - (itempad + thispad + thisbox->grouppady); | 1240 height = y - (itempad + thispad + thisbox->grouppady); |
1243 } | 1241 } |
1244 | 1242 |
1245 /* If the calculated size is valid... */ | 1243 /* If the calculated size is valid... */ |
1246 if(width > 0 && height > 0) | 1244 if(width > 0 && height > 0) |
1247 { | 1245 { |
1248 int pad = thisbox->items[z].pad; | 1246 int pad = thisbox->items[z].pad; |
1249 HWND handle = thisbox->items[z].hwnd; | 1247 HWND handle = thisbox->items[z].hwnd; |
6725 box = intbox; | 6723 box = intbox; |
6726 } | 6724 } |
6727 else | 6725 else |
6728 { | 6726 { |
6729 box = WinWindowFromID(box, FID_CLIENT); | 6727 box = WinWindowFromID(box, FID_CLIENT); |
6730 hsize = vsize = TRUE; | |
6731 } | 6728 } |
6732 } | 6729 } |
6733 | 6730 |
6734 thisbox = WinQueryWindowPtr(box, QWP_USER); | 6731 thisbox = WinQueryWindowPtr(box, QWP_USER); |
6735 | 6732 |