openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Specify which max() to use in dlogtool

Browse Source
This commit is contained in:
Sylae Jiendra Corell
2014-08-01 10:41:11 -06:00
parent 2bf9ea1148
commit 5fa67b54f8
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Win32/charedit/dlogtool.cpp
View File

@@ -1,4 +1,5 @@
#include <windows.h> #include <windows.h>
#include <algorithm>
#define ND 15 #define ND 15
#define NI 500 #define NI 500
@@ -471,20 +472,20 @@ BOOL CALLBACK dummy_dialog_proc(HWND hDlg, UINT message, WPARAM, LPARAM)
edit_box = CreateWindow("edit",NULL,WS_CHILD | WS_BORDER | WS_VISIBLE, edit_box = CreateWindow("edit",NULL,WS_CHILD | WS_BORDER | WS_VISIBLE,
item_rect[free_item].left,item_rect[free_item].top, item_rect[free_item].left,item_rect[free_item].top,
item_rect[free_item].right - item_rect[free_item].left, item_rect[free_item].right - item_rect[free_item].left,
max(22,item_rect[free_item].bottom - item_rect[free_item].top), std::max<short>(22,item_rect[free_item].bottom - item_rect[free_item].top),
dlgs[free_slot],(HMENU) 150,store_hInstance,NULL); dlgs[free_slot],(HMENU) 150,store_hInstance,NULL);
store_edit_parent = dlgs[free_slot]; store_edit_parent = dlgs[free_slot];
old_edit_proc = (WNDPROC) GetWindowLong(edit_box,GWL_WNDPROC); old_edit_proc = (WNDPROC) GetWindowLong(edit_box,GWL_WNDPROC);
SetWindowLong(edit_box,GWL_WNDPROC,(LONG) edit_proc); SetWindowLong(edit_box,GWL_WNDPROC,(LONG) edit_proc);
break; break;
} }
win_height = max(win_height, item_rect[free_item].bottom + 35); win_height = std::max<short>(win_height, item_rect[free_item].bottom + 35);
win_width = max(win_width, item_rect[free_item].right + 11); win_width = std::max<short>(win_width, item_rect[free_item].right + 11);
} }
} }
/*win_height += 8; /*win_height += 8;
win_width += 3;*/ win_width += 3;*/
MoveWindow(dlgs[free_slot],0,0,win_width,win_height,false); MoveWindow(dlgs[free_slot],0,0,win_width,win_height,false);
EndDialog(hDlg, 0); EndDialog(hDlg, 0);