dwindows: win/dw.c comparison

comparison win/dw.c @ 1370:e705051d841c

Test change on Windows to allow dw_container_cursor() to work on unsized containers. I also removed an old hack of initializing unpacked windows to a large size. There was a reason for this at one time, but I am hoping it isn't necessary anymore. My testing has not shown any issues so far.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Sun, 20 Nov 2011 16:34:44 +0000
parents	a595e368a393
children	896347a9be19

comparison

equal deleted inserted replaced

-:960ea1ec245e
+:e705051d841c
 /*
 * Dynamic Windows:
 *          A GTK like implementation of the Win32 GUI
 *
 * (C) 2000-2011 Brian Smith <brian@dbsoft.org>
-* (C) 2003-2005 Mark Hessling <m.hessling@qut.edu.au>
+* (C) 2003-2011 Mark Hessling <m.hessling@qut.edu.au>
 *
 */
 #define _WIN32_IE 0x0500
 #define WINVER 0x500
 #include <windows.h>
 GetClientRect(handle,&rect);
 TabCtrl_AdjustRect(handle,FALSE,&rect);
 MoveWindow(array[pageid]->hwnd, rect.left, rect.top,
 rect.right - rect.left, rect.bottom-rect.top, FALSE);
 }
+}
+/* So does the List View... handle delayed cursoring */
+if(strnicmp(tmpbuf, WC_LISTVIEW, strlen(WC_LISTVIEW)+1)==0 && width + vectorx > 10 && height + vectory > 10)
+{
+int index = DW_POINTER_TO_INT(dw_window_get_data(handle, "_dw_cursor"));
+if(index > 0)
+ListView_EnsureVisible(handle, index, TRUE);
 }
 if(thisbox->type == DW_HORZ)
 currentx += width + vectorx + (pad * 2);
 if(thisbox->type == DW_VERT)
 newbox->cinfo.fore = newbox->cinfo.back = -1;
 hwndframe = CreateWindow(FRAMECLASSNAME,
 "",
 WS_VISIBLE | WS_CHILD | WS_CLIPCHILDREN,
-0,0,2000,1000,
+0,0,0,0,
 DW_HWND_OBJECT,
 NULL,
 DWInstance,
 NULL);
 cinfo->fore = cinfo->back = -1;
 hwndframe = CreateWindow(ScrollClassName,
 "",
 WS_VISIBLE | WS_CHILD | WS_CLIPCHILDREN | WS_VSCROLL | WS_HSCROLL,
-0,0,2000,1000,
+0,0,0,0,
 DW_HWND_OBJECT,
 NULL,
 DWInstance,
 NULL);
 newbox->cinfo.fore = newbox->cinfo.back = -1;
 hwndframe = CreateWindow(FRAMECLASSNAME,
 "",
 WS_VISIBLE | WS_CHILD,
-0,0,2000,1000,
+0,0,0,0,
 DW_HWND_OBJECT,
 NULL,
 DWInstance,
 NULL);
 newbox->grouphwnd = CreateWindow(BUTTONCLASSNAME,
 title,
 WS_CHILD | BS_GROUPBOX |
 WS_VISIBLE | WS_CLIPCHILDREN,
-0,0,2000,1000,
+0,0,0,0,
 hwndframe,
 NULL,
 DWInstance,
 NULL);
 ccs.idFirstChild = 0;
 hwndframe = CreateWindow("MDICLIENT",
 "",
 WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS,
-0,0,2000,1000,
+0,0,0,0,
 DW_HWND_OBJECT,
 (HMENU)id,
 DWInstance,
 &ccs);
 return hwndframe;
 {
 #if (defined(BUILD_DLL) || defined(BUILD_HTML)) && !defined(__MINGW32__)
 return CreateWindow(BrowserClassName,
 "",
 WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS,
-0,0,2000,1000,
+0,0,0,0,
 DW_HWND_OBJECT,
 (HMENU)id,
 DWInstance,
 NULL);
 #else
 {
 return CreateWindow(STATICCLASSNAME,
 "",
 SS_BITMAP | SS_CENTERIMAGE | WS_VISIBLE |
 WS_CHILD | WS_CLIPCHILDREN,
-0,0,2000,1000,
+0,0,0,0,
 DW_HWND_OBJECT,
 (HMENU)id,
 DWInstance,
 NULL);
 }
 flags = TCS_BOTTOM;
 tmp = CreateWindow(WC_TABCONTROL,
 "",
 WS_VISIBLE | WS_CHILD | WS_CLIPCHILDREN | flags,
-0,0,2000,1000,
+0,0,0,0,
 DW_HWND_OBJECT,
 (HMENU)id,
 DWInstance,
 NULL);
 dw_window_set_data(tmp, "_dw_array", (void *)array);
 WS_VISIBLE | WS_CHILD |
 (multi ? 0 : LVS_SINGLESEL) |
 LVS_REPORT | LVS_SHOWSELALWAYS |
 LVS_SHAREIMAGELISTS | WS_BORDER |
 WS_CLIPCHILDREN,
-0,0,2000,1000,
+0,0,0,0,
 DW_HWND_OBJECT,
 (HMENU)id,
 DWInstance,
 NULL);
 ContainerInfo *cinfo = (ContainerInfo *)calloc(1, sizeof(ContainerInfo));
 "",
 WS_VISIBLE | WS_CHILD |
 TVS_HASLINES | TVS_SHOWSELALWAYS |
 TVS_HASBUTTONS | TVS_LINESATROOT |
 WS_BORDER | WS_CLIPCHILDREN,
-0,0,2000,1000,
+0,0,0,0,
 DW_HWND_OBJECT,
 (HMENU)id,
 DWInstance,
 NULL);
 ContainerInfo *cinfo = (ContainerInfo *)calloc(1, sizeof(ContainerInfo));
 HWND tmp = CreateWindow(STATICCLASSNAME,
 text,
 SS_NOPREFIX |
 BS_TEXT | WS_VISIBLE |
 WS_CHILD | WS_CLIPCHILDREN,
-0,0,2000,1000,
+0,0,0,0,
 DW_HWND_OBJECT,
 (HMENU)id,
 DWInstance,
 NULL);
 dw_window_set_font(tmp, DefaultFont);
 {
 HWND tmp = CreateWindow(ObjectClassName,
 text,
 BS_TEXT | WS_VISIBLE |
 WS_CHILD | WS_CLIPCHILDREN,
-0,0,2000,1000,
+0,0,0,0,
 DW_HWND_OBJECT,
 (HMENU)id,
 DWInstance,
 NULL);
 dw_window_set_font(tmp, DefaultFont);
 "",
 WS_VISIBLE | WS_BORDER |
 WS_VSCROLL | ES_MULTILINE |
 ES_WANTRETURN | WS_CHILD |
 WS_CLIPCHILDREN,
-0,0,2000,1000,
+0,0,0,0,
 DW_HWND_OBJECT,
 (HMENU)id,
 DWInstance,
 NULL);
 ContainerInfo *cinfo = (ContainerInfo *)calloc(1, sizeof(ContainerInfo));
 EDITCLASSNAME,
 text,
 ES_WANTRETURN | WS_CHILD |
 WS_BORDER | ES_AUTOHSCROLL |
 WS_VISIBLE | WS_CLIPCHILDREN,
-0,0,2000,1000,
+0,0,0,0,
 DW_HWND_OBJECT,
 (HMENU)id,
 DWInstance,
 NULL);
 ColorInfo *cinfo = calloc(1, sizeof(ColorInfo));
 EDITCLASSNAME,
 text,
 ES_WANTRETURN | WS_CHILD |
 ES_PASSWORD | WS_BORDER | WS_VISIBLE |
 ES_AUTOHSCROLL | WS_CLIPCHILDREN,
-0,0,2000,1000,
+0,0,0,0,
 DW_HWND_OBJECT,
 (HMENU)id,
 DWInstance,
 NULL);
 ColorInfo *cinfo = calloc(1, sizeof(ColorInfo));
 {
 HWND tmp = CreateWindow(COMBOBOXCLASSNAME,
 text,
 WS_CHILD | CBS_DROPDOWN | WS_VSCROLL |
 WS_CLIPCHILDREN | CBS_AUTOHSCROLL | WS_VISIBLE,
-0,0,2000,1000,
+0,0,0,0,
 DW_HWND_OBJECT,
 (HMENU)id,
 DWInstance,
 NULL);
 ColorInfo *cinfo = (ColorInfo *)calloc(1, sizeof(ColorInfo));
 HWND tmp = CreateWindow(BUTTONCLASSNAME,
 text,
 WS_CHILD | BS_PUSHBUTTON |
 WS_VISIBLE | WS_CLIPCHILDREN,
-0,0,2000,1000,
+0,0,0,0,
 DW_HWND_OBJECT,
 (HMENU)id,
 DWInstance,
 NULL);
 bubble->cinfo.fore = bubble->cinfo.back = -1;
 tmp = CreateWindow(BUTTONCLASSNAME,
 "",
 WS_CHILD | BS_PUSHBUTTON |
 WS_VISIBLE | WS_CLIPCHILDREN |
 (icon ? BS_ICON : BS_BITMAP),
-0,0,2000,1000,
+0,0,0,0,
 DW_HWND_OBJECT,
 (HMENU)id,
 DWInstance,
 NULL);
 #endif
 tmp = CreateWindow( BUTTONCLASSNAME,
 "",
 windowtype | WS_CHILD | BS_PUSHBUTTON | WS_CLIPCHILDREN | WS_VISIBLE,
-0,0,2000,1000,
+0,0,0,0,
 DW_HWND_OBJECT,
 (HMENU)id,
 DWInstance,
 NULL);
 tmp = CreateWindow( BUTTONCLASSNAME,
 "",
 WS_CHILD | BS_PUSHBUTTON |
 windowtype | WS_CLIPCHILDREN |
 WS_VISIBLE,
-0,0,2000,1000,
+0,0,0,0,
 DW_HWND_OBJECT,
 (HMENU)id,
 DWInstance,
 NULL );
 HWND buddy = CreateWindowEx(WS_EX_CLIENTEDGE,
 EDITCLASSNAME,
 text,
 WS_CHILD | WS_BORDER | WS_VISIBLE |
 ES_NUMBER | WS_CLIPCHILDREN,
-0,0,2000,1000,
+0,0,0,0,
 DW_HWND_OBJECT,
 NULL,
 DWInstance,
 NULL);
 HWND tmp = CreateWindowEx(WS_EX_CLIENTEDGE,
 UPDOWN_CLASS,
 NULL,
 WS_CHILD | UDS_ALIGNRIGHT | WS_BORDER |
 UDS_ARROWKEYS | UDS_SETBUDDYINT |
 UDS_WRAP | UDS_NOTHOUSANDS | WS_VISIBLE,
-0,0,2000,1000,
+0,0,0,0,
 DW_HWND_OBJECT,
 (HMENU)id,
 DWInstance,
 NULL);
 ColorInfo *cinfo = calloc(1, sizeof(ColorInfo));
 {
 HWND tmp = CreateWindow(BUTTONCLASSNAME,
 text,
 WS_CHILD | BS_AUTORADIOBUTTON |
 WS_CLIPCHILDREN | WS_VISIBLE,
-0,0,2000,1000,
+0,0,0,0,
 DW_HWND_OBJECT,
 (HMENU)id,
 DWInstance,
 NULL);
 BubbleButton *bubble = calloc(1, sizeof(BubbleButton));
 {
 HWND tmp = CreateWindow(TRACKBAR_CLASS,
 "",
 WS_CHILD | WS_CLIPCHILDREN | WS_VISIBLE |
 (vertical ? TBS_VERT : TBS_HORZ),
-0,0,2000,1000,
+0,0,0,0,
 DW_HWND_OBJECT,
 (HMENU)id,
 DWInstance,
 NULL);
 ColorInfo *cinfo = calloc(1, sizeof(ColorInfo));
 {
 HWND tmp = CreateWindow(SCROLLBARCLASSNAME,
 "",
 WS_CHILD | WS_CLIPCHILDREN | WS_VISIBLE |
 (vertical ? SBS_VERT : SBS_HORZ),
-0,0,2000,1000,
+0,0,0,0,
 DW_HWND_OBJECT,
 (HMENU)id,
 DWInstance,
 NULL);
 ColorInfo *cinfo = calloc(1, sizeof(ColorInfo));
 HWND API dw_percent_new(ULONG id)
 {
 return CreateWindow(PROGRESS_CLASS,
 "",
 WS_VISIBLE | WS_CHILD | WS_CLIPCHILDREN,
-0,0,2000,1000,
+0,0,0,0,
 DW_HWND_OBJECT,
 (HMENU)id,
 DWInstance,
 NULL);
 }
 BubbleButton *bubble = calloc(1, sizeof(BubbleButton));
 HWND tmp = CreateWindow(BUTTONCLASSNAME,
 text,
 WS_CHILD | BS_AUTOCHECKBOX |
 BS_TEXT | WS_CLIPCHILDREN | WS_VISIBLE,
-0,0,2000,1000,
+0,0,0,0,
 DW_HWND_OBJECT,
 (HMENU)id,
 DWInstance,
 NULL);
 bubble->checkbox = 1;
 "",
 WS_VISIBLE | LBS_NOINTEGRALHEIGHT |
 WS_CHILD | LBS_HASSTRINGS |
 LBS_NOTIFY | WS_BORDER  | WS_CLIPCHILDREN |
 WS_VSCROLL | (multi ? LBS_MULTIPLESEL : 0) ,
-0,0,2000,1000,
+0,0,0,0,
 DW_HWND_OBJECT,
 (HMENU)id,
 DWInstance,
 NULL);
 ContainerInfo *cinfo = (ContainerInfo *)calloc(1, sizeof(ContainerInfo));
 ListView_GetItem( handle, &lvi );
 if ( (textcomp && lvi.lParam && strcmp( (char *)lvi.lParam, text ) == 0) || (!textcomp && (char *)lvi.lParam == text) )
 {
+unsigned long width, height;
 ListView_SetItemState( handle, index, LVIS_FOCUSED | LVIS_SELECTED, LVIS_FOCUSED | LVIS_SELECTED );
+dw_window_get_pos_size( handle, NULL, NULL, &width, &height);
+if(width < 10 || height < 10)
+dw_window_set_data( handle, "_dw_cursor", DW_INT_TO_POINTER(index) );
 ListView_EnsureVisible( handle, index, TRUE );
 return;
 }
 index = ListView_GetNextItem( handle, index, LVNI_ALL );
 HWND API dw_splitbar_new(int type, HWND topleft, HWND bottomright, unsigned long id)
 {
 HWND tmp = CreateWindow(SplitbarClassName,
 "",
 WS_VISIBLE | WS_CHILD | WS_CLIPCHILDREN,
-0,0,2000,1000,
+0,0,0,0,
 DW_HWND_OBJECT,
 (HMENU)id,
 DWInstance,
 NULL);
 MONTHDAYSTATE mds[3];
 HWND tmp = CreateWindowEx(WS_EX_CLIENTEDGE,
 MONTHCAL_CLASS,
 "",
 WS_VISIBLE | WS_CHILD | WS_CLIPCHILDREN | MCS_DAYSTATE,
-0,0,2000,1000, // resize it later
+0,0,0,0,
 DW_HWND_OBJECT,
 (HMENU)id,
 DWInstance,
 NULL);
 if ( tmp )

Mercurial > dwindows

comparison win/dw.c @ 1370:e705051d841c