dwindows: os2/dw.c comparison

comparison os2/dw.c @ 1531:783a464afab2

Added window and box support to dw_window_get_preferred_size() on OS/2 and Windows. Fixed a number of potentially dangerous code segments on OS/2 and Windows. Updated inaccurate comments due to cut and paste and code changes and the readme.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Sat, 07 Jan 2012 13:59:58 +0000
parents	5facb5380944
children	ad8181f70f31

comparison

equal deleted inserted replaced

-:eecfceaf581f
+:783a464afab2
 HWND child, entry = 0;
 henum = WinBeginEnumWindows(handle);
 while((child = WinGetNextWindow(henum)) != NULLHANDLE)
 {
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 WinQueryClassName(child, 99, (PCH)tmpbuf);
 if(strncmp(tmpbuf, "#6", 3)==0)  /* Entryfield */
 {
 HWND child;
 henum = WinBeginEnumWindows(handle);
 while((child = WinGetNextWindow(henum)) != NULLHANDLE)
 {
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 WinQueryClassName(child, 99, (PCH)tmpbuf);
 if(strncmp(tmpbuf, "#3", 3)==0 && dw)  /* Button */
 WinSetOwner(child, dw);
 }
 if(ptr)
 {
 WindowData *wd = (WindowData *)ptr;
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 WinQueryClassName(handle, 99, (PCH)tmpbuf);
 if(strncmp(tmpbuf, "ColorSelectClass", 17)!=0)
 {
 /* This function returns 1 if the window (widget) handle
 * passed to it is a valid window that can gain input focus.
 */
 int _validate_focus(HWND handle)
 {
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 if(!handle)
 return 0;
 WinQueryClassName(handle, 99, (PCH)tmpbuf);
 lasthwnd = box->items[z].hwnd;
 }
 else
 {
-char tmpbuf[100] = "";
+char tmpbuf[100] = {0};
 WinQueryClassName(box->items[z].hwnd, 99, (PCH)tmpbuf);
 if(strncmp(tmpbuf, SplitbarClassName, strlen(SplitbarClassName)+1)==0)
 {
 /* Then try the bottom or right box */
 lasthwnd = box->items[z].hwnd;
 }
 else
 {
-char tmpbuf[100] = "";
+char tmpbuf[100] = {0};
 WinQueryClassName(box->items[z].hwnd, 99, (PCH)tmpbuf);
 if(strncmp(tmpbuf, SplitbarClassName, strlen(SplitbarClassName)+1)==0)
 {
 /* Try the top or left box */
 return rc;
 }
 void _check_resize_notebook(HWND hwnd)
 {
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 WinQueryClassName(hwnd, 99, (PCH)tmpbuf);
 /* If we have a notebook we resize the page again. */
 if(strncmp(tmpbuf, "#40", 4)==0)
 /* If the calculated size is valid... */
 if(width > 0 && height > 0)
 {
 int pad = thisbox->items[z].pad;
 HWND handle = thisbox->items[z].hwnd;
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 WinQueryClassName(handle, 99, (PCH)tmpbuf);
 if(strncmp(tmpbuf, "#2", 3)==0)
 {
 return WinDefWindowProc(hWnd, msg, mp1, mp2);
 }
 void _click_default(HWND handle)
 {
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 WinQueryClassName(handle, 99, (PCH)tmpbuf);
 /* These are the window classes which can
 * obtain input focus.
 */
 MRESULT EXPENTRY _entryproc(HWND hWnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
 WindowData *blah = (WindowData *)WinQueryWindowPtr(hWnd, QWP_USER);
 PFNWP oldproc = 0;
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 if(blah)
 oldproc = blah->oldproc;
 WinQueryClassName(hWnd, 99, (PCH)tmpbuf);
 * Text/Status: (textwidth)x(textheight)
 */
 void _control_size(HWND handle, int *width, int *height)
 {
 int thiswidth = 1, thisheight = 1, extrawidth = 0, extraheight = 0;
-char tmpbuf[100], *buf = dw_window_get_text(handle);
+char tmpbuf[100] = {0}, *buf = dw_window_get_text(handle);
 static char testtext[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
 WinQueryClassName(handle, 99, (PCH)tmpbuf);
 /* If we have a string...
 * Parameters:
 *       handle: Handle to the window.
 */
 void API dw_window_disable(HWND handle)
 {
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 if(handle < 65536)
 {
 char buffer[30];
 HMENUI mymenu;
 */
 HWND API dw_window_from_id(HWND handle, int id)
 {
 HENUM henum;
 HWND child;
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 henum = WinBeginEnumWindows(handle);
 while((child = WinGetNextWindow(henum)) != NULLHANDLE)
 {
 int windowid = WinQueryWindowUShort(child, QWS_ID);
 if(thisbox)
 {
 int z, x = 0;
 Item *tmpitem, *thisitem = thisbox->items;
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 HWND frame = (HWND)dw_window_get_data(item, "_dw_combo_box");
 /* Do some sanity bounds checking */
 if(index < 0)
 index = 0;
 *       width: Width in pixels of the item or NULL if not needed.
 *       height: Height in pixels of the item or NULL if not needed.
 */
 void API dw_window_get_preferred_size(HWND handle, int *width, int *height)
 {
-_control_size(handle, width, height);
+char tmpbuf[100] = {0};
+WinQueryClassName(handle, 99, (PCH)tmpbuf);
+if(strncmp(tmpbuf, "#1", 3)==0)
+{
+HWND box = WinWindowFromID(handle, FID_CLIENT);
+if(box)
+{
+unsigned long thiswidth = 0, thisheight = 0;
+/* Get the size with the border */
+_get_window_for_size(handle, &thiswidth, &thisheight);
+/* Return what was requested */
+if(width) *width = (int)thiswidth;
+if(height) *height = (int)thisheight;
+}
+else
+{
+Box *thisbox = WinQueryWindowPtr(handle, QWP_USER);
+if(thisbox)
+{
+int depth = 0;
+/* Calculate space requirements */
+_resize_box(thisbox, &depth, 0, 0, 1);
+/* Return what was requested */
+if(width) *width = thisbox->minwidth;
+if(height) *height = thisbox->minheight;
+}
+}
+}
+else
+_control_size(handle, width, height);
 }
 /*
 * Returns the width of the screen.
 */
 *          index: Item index.
 *          state: TRUE if selected FALSE if unselected.
 */
 void API dw_listbox_select(HWND handle, int index, int state)
 {
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 WinSendMsg(handle, LM_SELECTITEM, MPFROMSHORT(index), (MPARAM)state);
 WinQueryClassName(handle, 99, (PCH)tmpbuf);

Mercurial > dwindows

comparison os2/dw.c @ 1531:783a464afab2