dwindows: win/dw.c comparison

comparison win/dw.c @ 630:6e84e055d981

Attempt to make click_default work properly. Fix for dw_timer_connect() Use better directory browser widget. Fix for dw_container_delete_row() and dw_container_cursor()

author	mhessling@81767d24-ef19-dc11-ae90-00e081727c95
date	Thu, 30 Oct 2008 10:43:16 +0000
parents	7d93356f250a
children	c6a216c8174f

comparison

equal deleted inserted replaced

-:a5deb87b26e4
+:6e84e055d981
 #include <string.h>
 #include <stdio.h>
 #include <process.h>
 #include <time.h>
 #include "dw.h"
+#include "XBrowseForFolder.h"
 /*
 * MinGW (as at 3.2.3) doesn't have MIM_MENUDATA
 * so #define it here
 */
 LRESULT CALLBACK _browserWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 void _resize_notebook_page(HWND handle, int pageid);
 void _handle_splitbar_resize(HWND hwnd, float percent, int type, int x, int y);
 int _lookup_icon(HWND handle, HICON hicon, int type);
 HFONT _acquire_font(HWND handle, char *fontname);
+void _click_default(HWND handle);
 typedef struct _sighandler
 {
 struct _sighandler   *next;
 ULONG message;
 new->signalfunction = signalfunction;
 new->data = data;
 new->next = NULL;
 if (!Root)
+{
 Root = new;
+}
 else
 {
 SignalHandler *prev = NULL, *tmp = Root;
 while(tmp)
 {
 {
 int (*timerfunc)(void *) = tmp->signalfunction;
 if (tmp->id == (int)mp1)
 {
 if (!timerfunc(tmp->data))
+{
 dw_timer_disconnect(tmp->id);
+}
 tmp = NULL;
 }
 }
 result = 0;
 }
 }
 }
 }
 break;
 case WM_CHAR:
-if(LOWORD(mp1) == '\t')
+if ( LOWORD( mp1 ) == '\t' )
 {
-if(GetAsyncKeyState(VK_SHIFT) & 0x8000)
+if ( GetAsyncKeyState( VK_SHIFT ) & 0x8000 )
-_shift_focus_back(hWnd);
+_shift_focus_back( hWnd );
 else
-_shift_focus(hWnd);
+_shift_focus( hWnd );
 return TRUE;
+}
+else if( LOWORD( mp1 ) == '\r' )
+{
+ColorInfo *cinfo = (ColorInfo *)GetWindowLongPtr( hWnd, GWLP_USERDATA );
+if ( cinfo && cinfo->clickdefault )
+{
+_click_default( cinfo->clickdefault );
+}
 }
 break;
 case WM_USER:
 windowfunc = (void *)mp1;
 GetClassName(hWnd, tmpbuf, 99);
 if(strcmp(tmpbuf, FRAMECLASSNAME) == 0)
 cinfo = &(((Box *)cinfo)->cinfo);
-if(msg == WM_MOUSEMOVE)
+if ( msg == WM_MOUSEMOVE )
 _wndproc(hWnd, msg, mp1, mp2);
 if (cinfo)
 {
 pOldProc = cinfo->pOldProc;
 }
 return FALSE;
 }
 else if(LOWORD(mp1) == '\r')
 {
-if (cinfo->clickdefault)
+if ( cinfo->clickdefault )
 {
 _click_default(cinfo->clickdefault);
+}
+else
+{
+/*
+* Find the toplevel window for the current window and check if it
+* has a default click set
+*/
+HWND tl = _toplevel_window( hWnd );
+ColorInfo *mycinfo = (ColorInfo *)GetWindowLongPtr( tl, GWLP_USERDATA );
+if ( mycinfo && cinfo->clickdefault )
+{
+_click_default( mycinfo->clickdefault );
+}
 }
 }
 /* Tell the spinner control that a keypress has
 * occured and to update it's internal value.
 /* Calling ReleaseCapture in Win95 also causes WM_CAPTURECHANGED
 * to be sent.  Be sure to account for that.
 */
 ReleaseCapture();
-if(bMouseOver)
+if(bMouseOver && hwndBubble)
 {
 bMouseOver = 0;
 _free_window_memory(hwndBubble, 0);
 DestroyWindow(hwndBubble);
 hwndBubble = 0;
 case WM_CAPTURECHANGED:
 /* This message means we are losing the capture for some reason
 * Either because we intentionally lost it or another window
 * stole it
 */
-if(bMouseOver)
+if(bMouseOver && hwndBubble)
 {
 bMouseOver = 0;
 _free_window_memory(hwndBubble, 0);
 DestroyWindow(hwndBubble);
 hwndBubble = 0;
 */
 void API dw_container_cursor(HWND handle, char *text)
 {
 int index = ListView_GetNextItem(handle, -1, LVNI_ALL);
-while(index != -1)
+while ( index != -1 )
 {
 LV_ITEM lvi;
 memset(&lvi, 0, sizeof(LV_ITEM));
 lvi.iItem = index;
 lvi.mask = LVIF_PARAM;
-ListView_GetItem(handle, &lvi);
+ListView_GetItem( handle, &lvi );
-if((char *)lvi.lParam == text)
+if ( strcmp( (char *)lvi.lParam, text ) == 0 )
 {
-ListView_SetItemState(handle, index, LVIS_FOCUSED | LVIS_SELECTED, LVIS_FOCUSED | LVIS_SELECTED);
+ListView_SetItemState( handle, index, LVIS_FOCUSED | LVIS_SELECTED, LVIS_FOCUSED | LVIS_SELECTED );
-ListView_EnsureVisible(handle, index, TRUE);
+ListView_EnsureVisible( handle, index, TRUE );
 return;
 }
-index = ListView_GetNextItem(handle, index, LVNI_ALL);
+index = ListView_GetNextItem( handle, index, LVNI_ALL );
 }
 }
 /*
 * Deletes the item with the text speficied.
 lvi.iItem = index;
 lvi.mask = LVIF_PARAM;
 ListView_GetItem(handle, &lvi);
-if((char *)lvi.lParam == text)
+if ( strcmp( (char *)lvi.lParam, text ) == 0 )
 {
 int _index = (int)dw_window_get_data(handle, "_dw_index");
 if(index < _index)
 dw_window_set_data(handle, "_dw_index", (void *)(_index - 1));
 void API dw_window_click_default(HWND window, HWND next)
 {
 ColorInfo *cinfo = (ColorInfo *)GetWindowLongPtr(window, GWLP_USERDATA);
 if (cinfo)
+{
 cinfo->clickdefault = next;
+}
 }
 /*
 * Gets the contents of the default clipboard as text.
 * Parameters:
 BROWSEINFO bi;
 TCHAR szDir[MAX_PATH];
 LPITEMIDLIST pidl;
 LPMALLOC pMalloc;
-if(flags==DW_DIRECTORY_OPEN)
+if ( flags == DW_DIRECTORY_OPEN )
 {
+#if 0
 if (SUCCEEDED(SHGetMalloc(&pMalloc)))
 {
 ZeroMemory(&bi,sizeof(bi));
 bi.hwndOwner = NULL;
 bi.pszDisplayName = 0;
 pMalloc->lpVtbl->Free(pMalloc,pidl);
 pMalloc->lpVtbl->Release(pMalloc);
 return strdup(filenamebuf);
 }
 }
+#else
+if ( XBrowseForFolder( NULL,
+(LPCTSTR)defpath,
+-1,
+(LPCTSTR)title,
+(LPTSTR)filenamebuf,
+1000,
+FALSE ) )
+{
+return strdup( filenamebuf );
+}
+#endif
 }
 else
 {
 if (ext)
 {

Mercurial > dwindows

comparison win/dw.c @ 630:6e84e055d981