dwindows: win/dw.c annotate

annotate win/dw.c @ 535:b0b5b880513a

Don't reverse packing on vertical boxes to compensate for the inverted Y-axis on OS/2. Instead this should be dealt with in the layout code taking into account the size of the box the items are sitting on. This new code mostly works, but has some problems.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Wed, 24 Mar 2004 00:05:39 +0000
parents	222b0f32e7c9
children	8f80ed604a89

rev	line source
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1 /*
283 54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	2 /*
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3 * Dynamic Windows:
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4 * A GTK like implementation of the Win32 GUI
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5 *
516 caa7ed17c132 Updated copyrights and license file. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 514 diff changeset	6 * (C) 2000-2004 Brian Smith <dbsoft@technologist.com>
caa7ed17c132 Updated copyrights and license file. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 514 diff changeset	7 * (C) 2003-2004 Mark Hessling <m.hessling@qut.edu.au>
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8 *
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9 */
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	10 #define _WIN32_IE 0x0500
466 c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	11 #define WINVER 0x500
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	12 #include <windows.h>
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	13 #include <windowsx.h>
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	14 #include <commctrl.h>
75 c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	15 #include <shlwapi.h>
449 787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	16 #include <shlobj.h>
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	17 #include <stdlib.h>
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	18 #include <string.h>
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	19 #include <stdio.h>
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	20 #include <process.h>
37 360bc6a5f1c9 Sync with latest Dynamic Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 34 diff changeset	21 #include <time.h>
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	22 #include "dw.h"
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	23
527 e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	24 HWND popup = (HWND)NULL, hwndBubble = (HWND)NULL, DW_HWND_OBJECT = (HWND)NULL;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	25
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	26 HINSTANCE DWInstance = NULL;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	27
75 c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	28 DWORD dwVersion = 0, dwComctlVer = 0;
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	29 DWTID _dwtid = -1;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	30
75 c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	31 #define PACKVERSION(major,minor) MAKELONG(minor,major)
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	32
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	33 #define IS_IE5PLUS (dwComctlVer >= PACKVERSION(5,80))
506 f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	34 #define IS_WINNTOR95 (((LOBYTE(LOWORD(dwVersion))) < 5) && (HIBYTE(LOWORD(dwVersion)) < 10))
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	35
95 636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	36 #ifndef MIN
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	37 #define MIN(a, b) (((a) < (b)) ? (a) : (b))
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	38 #endif
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	39
506 f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	40 static BOOL (WINAPI* MyGetMenuInfo)(HMENU, LPCMENUINFO) = 0;
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	41 static BOOL (WINAPI* MySetMenuInfo)(HMENU, LPCMENUINFO) = 0;
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	42
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	43 int main(int argc, char *argv[]);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	44
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	45 #define ICON_INDEX_LIMIT 200
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	46 HICON lookup[200];
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	47 HIMAGELIST hSmall = 0, hLarge = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	48
105 ad95fc623ff3 Some changes to the container optimization code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 104 diff changeset	49 /* Special flag used for internal tracking */
ad95fc623ff3 Some changes to the container optimization code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 104 diff changeset	50 #define DW_CFA_RESERVED (1 << 30)
ad95fc623ff3 Some changes to the container optimization code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 104 diff changeset	51
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	52 #define THREAD_LIMIT 128
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	53 COLORREF _foreground[THREAD_LIMIT];
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	54 COLORREF _background[THREAD_LIMIT];
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	55 HPEN _hPen[THREAD_LIMIT];
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	56 HBRUSH _hBrush[THREAD_LIMIT];
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	57
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	58 BYTE _red[] = { 0x00, 0xbb, 0x00, 0xaa, 0x00, 0xbb, 0x00, 0xaa, 0x77,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	59 0xff, 0x00, 0xee, 0x00, 0xff, 0x00, 0xff, 0xaa, 0x00 };
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	60 BYTE _green[] = { 0x00, 0x00, 0xbb, 0xaa, 0x00, 0x00, 0xbb, 0xaa, 0x77,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	61 0x00, 0xff, 0xee, 0x00, 0x00, 0xee, 0xff, 0xaa, 0x00 };
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	62 BYTE _blue[] = { 0x00, 0x00, 0x00, 0x00, 0xcc, 0xbb, 0xbb, 0xaa, 0x77,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	63 0x00, 0x00, 0x00, 0xff, 0xff, 0xee, 0xff, 0xaa, 0x00};
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	64
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	65 HBRUSH _colors[18];
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	66
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	67
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	68 void _resize_notebook_page(HWND handle, int pageid);
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	69 void _handle_splitbar_resize(HWND hwnd, float percent, int type, int x, int y);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	70 int _lookup_icon(HWND handle, HICON hicon, int type);
299 2a97f8d9b297 Use DrawStatusText() to make the status lines, instead of doing it ourself. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 298 diff changeset	71 HFONT _acquire_font(HWND handle, char *fontname);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	72
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	73 typedef struct _sighandler
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	74 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	75 struct _sighandler *next;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	76 ULONG message;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	77 HWND window;
197 f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	78 int id;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	79 void *signalfunction;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	80 void *data;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	81
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	82 } SignalHandler;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	83
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	84 SignalHandler *Root = NULL;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	85
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	86 typedef struct
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	87 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	88 ULONG message;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	89 char name[30];
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	90
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	91 } SignalList;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	92
60 61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	93 static int in_checkbox_handler = 0;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	94
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	95 /* List of signals and their equivilent Win32 message */
481 97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	96 #define SIGNALMAX 17
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	97
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	98 SignalList SignalTranslate[SIGNALMAX] = {
481 97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	99 { WM_SIZE, DW_SIGNAL_CONFIGURE },
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	100 { WM_CHAR, DW_SIGNAL_KEY_PRESS },
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	101 { WM_LBUTTONDOWN, DW_SIGNAL_BUTTON_PRESS },
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	102 { WM_LBUTTONUP, DW_SIGNAL_BUTTON_PRESS },
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	103 { WM_MOUSEMOVE, DW_SIGNAL_MOTION_NOTIFY },
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	104 { WM_CLOSE, DW_SIGNAL_DELETE },
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	105 { WM_PAINT, DW_SIGNAL_EXPOSE },
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	106 { WM_COMMAND, DW_SIGNAL_CLICKED },
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	107 { NM_DBLCLK, DW_SIGNAL_ITEM_ENTER },
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	108 { NM_RCLICK, DW_SIGNAL_ITEM_CONTEXT },
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	109 { LBN_SELCHANGE, DW_SIGNAL_LIST_SELECT },
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	110 { TVN_SELCHANGED, DW_SIGNAL_ITEM_SELECT },
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	111 { WM_SETFOCUS, DW_SIGNAL_SET_FOCUS },
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	112 { WM_VSCROLL, DW_SIGNAL_VALUE_CHANGED },
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	113 { TCN_SELCHANGE, DW_SIGNAL_SWITCH_PAGE },
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	114 { LVN_COLUMNCLICK, DW_SIGNAL_COLUMN_CLICK },
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	115 { TVN_ITEMEXPANDED,DW_SIGNAL_TREE_EXPAND }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	116 };
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	117
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	118 #ifdef BUILD_DLL
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	119 void Win32_Set_Instance(HINSTANCE hInstance)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	120 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	121 DWInstance = hInstance;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	122 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	123 #else
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	124 char *_convertargs(int count, char *start)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	125 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	126 char tmp, argstart, **argv;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	127 int loc = 0, inquotes = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	128
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	129 (*count) = 1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	130
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	131 tmp = start;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	132
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	133 /* Count the number of entries */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	134 if(*start)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	135 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	136 (*count)++;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	137
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	138 while(*tmp)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	139 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	140 if(*tmp == '"' && inquotes)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	141 inquotes = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	142 else if(*tmp == '"' && !inquotes)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	143 inquotes = 1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	144 else if(*tmp == ' ' && !inquotes)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	145 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	146 /* Push past any white space */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	147 while(*(tmp+1) == ' ')
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	148 tmp++;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	149 /* If we aren't at the end of the command
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	150 * line increment the count.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	151 */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	152 if(*(tmp+1))
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	153 (*count)++;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	154 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	155 tmp++;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	156 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	157 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	158
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	159 argv = (char *)malloc(sizeof(char ) * ((*count)+1));
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	160 argv[0] = malloc(260);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	161 GetModuleFileName(DWInstance, argv[0], 260);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	162
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	163 argstart = tmp = start;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	164
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	165 if(*start)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	166 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	167 loc = 1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	168
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	169 while(*tmp)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	170 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	171 if(*tmp == '"' && inquotes)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	172 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	173 *tmp = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	174 inquotes = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	175 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	176 else if(*tmp == '"' && !inquotes)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	177 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	178 argstart = tmp+1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	179 inquotes = 1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	180 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	181 else if(*tmp == ' ' && !inquotes)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	182 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	183 *tmp = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	184 argv[loc] = strdup(argstart);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	185
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	186 /* Push past any white space */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	187 while(*(tmp+1) == ' ')
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	188 tmp++;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	189
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	190 /* Move the start pointer */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	191 argstart = tmp+1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	192
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	193 /* If we aren't at the end of the command
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	194 * line increment the count.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	195 */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	196 if(*(tmp+1))
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	197 loc++;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	198 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	199 tmp++;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	200 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	201 if(*argstart)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	202 argv[loc] = strdup(argstart);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	203 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	204 argv[loc+1] = NULL;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	205 return argv;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	206 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	207
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	208 /* Ok this is a really big hack but what the hell ;) */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	209 int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	210 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	211 char **argv;
466 c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	212 int argc;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	213
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	214 DWInstance = hInstance;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	215
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	216 argv = _convertargs(&argc, lpCmdLine);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	217
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	218 return main(argc, argv);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	219 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	220 #endif
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	221
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	222 /* This should return true for WinNT/2K/XP and false on Win9x */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	223 int IsWinNT(void)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	224 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	225 static int isnt = -1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	226
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	227 if(isnt == -1)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	228 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	229 if (GetVersion() < 0x80000000)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	230 isnt = 1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	231 else
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	232 isnt = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	233 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	234 return isnt;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	235 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	236
75 c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	237 DWORD GetDllVersion(LPCTSTR lpszDllName)
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	238 {
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	239
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	240 HINSTANCE hinstDll;
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	241 DWORD dwVersion = 0;
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	242
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	243 hinstDll = LoadLibrary(lpszDllName);
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	244
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	245 if(hinstDll)
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	246 {
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	247 DLLGETVERSIONPROC pDllGetVersion;
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	248
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	249 pDllGetVersion = (DLLGETVERSIONPROC) GetProcAddress(hinstDll, "DllGetVersion");
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	250
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	251 /* Because some DLLs might not implement this function, you
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	252 * must test for it explicitly. Depending on the particular
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	253 * DLL, the lack of a DllGetVersion function can be a useful
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	254 * indicator of the version.
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	255 */
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	256 if(pDllGetVersion)
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	257 {
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	258 DLLVERSIONINFO dvi;
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	259 HRESULT hr;
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	260
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	261 ZeroMemory(&dvi, sizeof(dvi));
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	262 dvi.cbSize = sizeof(dvi);
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	263
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	264 hr = (*pDllGetVersion)(&dvi);
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	265
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	266 if(SUCCEEDED(hr))
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	267 {
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	268 dwVersion = PACKVERSION(dvi.dwMajorVersion, dvi.dwMinorVersion);
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	269 }
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	270 }
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	271
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	272 FreeLibrary(hinstDll);
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	273 }
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	274 return dwVersion;
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	275 }
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	276
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	277 /* This function adds a signal handler callback into the linked list.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	278 */
197 f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	279 void _new_signal(ULONG message, HWND window, int id, void signalfunction, void data)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	280 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	281 SignalHandler *new = malloc(sizeof(SignalHandler));
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	282
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	283 new->message = message;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	284 new->window = window;
197 f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	285 new->id = id;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	286 new->signalfunction = signalfunction;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	287 new->data = data;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	288 new->next = NULL;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	289
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	290 if (!Root)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	291 Root = new;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	292 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	293 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	294 SignalHandler prev = NULL, tmp = Root;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	295 while(tmp)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	296 {
68 8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	297 if(tmp->message == message &&
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	298 tmp->window == window &&
466 c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	299 tmp->id == id &&
68 8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	300 tmp->signalfunction == signalfunction)
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	301 {
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	302 tmp->data = data;
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	303 free(new);
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	304 return;
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	305 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	306 prev = tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	307 tmp = tmp->next;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	308 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	309 if(prev)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	310 prev->next = new;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	311 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	312 Root = new;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	313 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	314 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	315
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	316 /* Finds the message number for a given signal name */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	317 ULONG _findsigmessage(char *signame)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	318 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	319 int z;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	320
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	321 for(z=0;z<SIGNALMAX;z++)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	322 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	323 if(stricmp(signame, SignalTranslate[z].name) == 0)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	324 return SignalTranslate[z].message;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	325 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	326 return 0L;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	327 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	328
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	329 /* This function removes and handlers on windows and frees
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	330 * the user memory allocated to it.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	331 */
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	332 BOOL CALLBACK _free_window_memory(HWND handle, LPARAM lParam)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	333 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	334 ColorInfo thiscinfo = (ColorInfo )GetWindowLongPtr(handle, GWLP_USERDATA);
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	335 HFONT oldfont = (HFONT)SendMessage(handle, WM_GETFONT, 0, 0);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	336 HICON oldicon = (HICON)SendMessage(handle, WM_GETICON, 0, 0);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	337 char tmpbuf[100];
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	338
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	339 /* Delete font, icon and bitmap GDI objects in use */
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	340 if(oldfont)
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	341 DeleteObject(oldfont);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	342 if(oldicon)
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	343 DeleteObject(oldicon);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	344
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	345 GetClassName(handle, tmpbuf, 99);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	346
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	347 if(strnicmp(tmpbuf, STATICCLASSNAME, strlen(STATICCLASSNAME)+1)==0)
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	348 {
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	349 HBITMAP oldbitmap = (HBITMAP)SendMessage(handle, STM_GETIMAGE, IMAGE_BITMAP, 0);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	350
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	351 if(oldbitmap)
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	352 DeleteObject(oldbitmap);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	353 }
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	354 if(strnicmp(tmpbuf, BUTTONCLASSNAME, strlen(BUTTONCLASSNAME)+1)==0)
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	355 {
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	356 HBITMAP oldbitmap = (HBITMAP)SendMessage(handle, BM_GETIMAGE, IMAGE_BITMAP, 0);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	357
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	358 if(oldbitmap)
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	359 DeleteObject(oldbitmap);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	360 }
180 4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	361 else if(strnicmp(tmpbuf, FRAMECLASSNAME, strlen(FRAMECLASSNAME)+1)==0)
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	362 {
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	363 Box box = (Box )thiscinfo;
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	364
509 a9cfbc5ad01e MDI frames have no data saved on their titlebared window handles, so bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 508 diff changeset	365 if(box && box->count && box->items)
180 4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	366 free(box->items);
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	367 }
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	368 else if(strnicmp(tmpbuf, SplitbarClassName, strlen(SplitbarClassName)+1)==0)
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	369 {
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	370 void *data = dw_window_get_data(handle, "_dw_percent");
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	371
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	372 if(data)
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	373 free(data);
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	374 }
291 70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	375 else if(strnicmp(tmpbuf, WC_TREEVIEW, strlen(WC_TREEVIEW)+1)==0)
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	376 {
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	377 dw_tree_clear(handle);
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	378 }
180 4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	379 else if(strnicmp(tmpbuf, WC_TABCONTROL, strlen(WC_TABCONTROL)+1)==0) /* Notebook */
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	380 {
191 634625c3239d Fixes for dw_color_xxxx_set() to accept OS/2 style colors, and fixed a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 185 diff changeset	381 NotebookPage array = (NotebookPage )dw_window_get_data(handle, "_dw_array");
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	382
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	383 if(array)
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	384 {
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	385 int z, refid = -1;
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	386
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	387 for(z=0;z<256;z++)
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	388 {
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	389 if(array[z])
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	390 {
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	391 _free_window_memory(array[z]->hwnd, 0);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	392 EnumChildWindows(array[z]->hwnd, _free_window_memory, 0);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	393 DestroyWindow(array[z]->hwnd);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	394 free(array[z]);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	395 }
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	396 }
343 bab5cd8dd93f Forgot to free the array of pointers in the notebook control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 341 diff changeset	397 free(array);
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	398 }
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	399 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	400
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	401 dw_signal_disconnect_by_window(handle);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	402
82 aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	403 if(thiscinfo)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	404 {
180 4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	405 SubclassWindow(handle, thiscinfo->pOldProc);
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	406
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	407 /* Delete the brush so as not to leak GDI objects */
82 aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	408 if(thiscinfo->hbrush)
aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	409 DeleteObject(thiscinfo->hbrush);
aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	410
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	411 /* Free user data linked list memory */
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	412 if(thiscinfo->root)
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	413 dw_window_set_data(handle, NULL, NULL);
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	414
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	415 SetWindowLongPtr(handle, GWLP_USERDATA, 0);
82 aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	416 free(thiscinfo);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	417 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	418 return TRUE;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	419 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	420
468 0a2f13ba2d5c More menu fixes, free signal handlers and memory on OS/2, and the begining bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 467 diff changeset	421 void _free_menu_data(HMENU menu)
0a2f13ba2d5c More menu fixes, free signal handlers and memory on OS/2, and the begining bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 467 diff changeset	422 {
506 f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	423 if(!IS_WINNTOR95)
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	424 {
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	425 int i, count = GetMenuItemCount(menu);
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	426
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	427 for(i=0;i<count;i++)
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	428 {
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	429 MENUITEMINFO mii;
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	430
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	431 mii.cbSize = sizeof(MENUITEMINFO);
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	432 mii.fMask = MIIM_SUBMENU;
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	433
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	434 if(GetMenuItemInfo(menu, i, TRUE, &mii)
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	435 && mii.hSubMenu)
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	436 _free_menu_data(mii.hSubMenu);
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	437 }
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	438 }
468 0a2f13ba2d5c More menu fixes, free signal handlers and memory on OS/2, and the begining bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 467 diff changeset	439 dw_signal_disconnect_by_name((HWND)menu, DW_SIGNAL_CLICKED);
0a2f13ba2d5c More menu fixes, free signal handlers and memory on OS/2, and the begining bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 467 diff changeset	440 }
0a2f13ba2d5c More menu fixes, free signal handlers and memory on OS/2, and the begining bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 467 diff changeset	441
191 634625c3239d Fixes for dw_color_xxxx_set() to accept OS/2 style colors, and fixed a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 185 diff changeset	442 /* Convert to our internal color scheme */
634625c3239d Fixes for dw_color_xxxx_set() to accept OS/2 style colors, and fixed a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 185 diff changeset	443 ULONG _internal_color(ULONG color)
634625c3239d Fixes for dw_color_xxxx_set() to accept OS/2 style colors, and fixed a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 185 diff changeset	444 {
369 39983df2b93d Updated the license information, and copyrights. Code to do background bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 355 diff changeset	445 if(color == DW_CLR_DEFAULT)
39983df2b93d Updated the license information, and copyrights. Code to do background bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 355 diff changeset	446 return DW_RGB_TRANSPARENT;
191 634625c3239d Fixes for dw_color_xxxx_set() to accept OS/2 style colors, and fixed a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 185 diff changeset	447 if(color < 18)
634625c3239d Fixes for dw_color_xxxx_set() to accept OS/2 style colors, and fixed a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 185 diff changeset	448 return DW_RGB(_red[color], _green[color], _blue[color]);
634625c3239d Fixes for dw_color_xxxx_set() to accept OS/2 style colors, and fixed a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 185 diff changeset	449 return color;
634625c3239d Fixes for dw_color_xxxx_set() to accept OS/2 style colors, and fixed a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 185 diff changeset	450 }
634625c3239d Fixes for dw_color_xxxx_set() to accept OS/2 style colors, and fixed a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 185 diff changeset	451
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	452 /* This function returns 1 if the window (widget) handle
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	453 * passed to it is a valid window that can gain input focus.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	454 */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	455 int _validate_focus(HWND handle)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	456 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	457 char tmpbuf[100];
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	458
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	459 if(!handle)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	460 return 0;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	461
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	462 if(!IsWindowEnabled(handle))
39 3aa9ef0b3996 Added focus fixes and set-focus fixes on all three platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 37 diff changeset	463 return 0;
3aa9ef0b3996 Added focus fixes and set-focus fixes on all three platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 37 diff changeset	464
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	465 GetClassName(handle, tmpbuf, 99);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	466
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	467 /* These are the window classes which can
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	468 * obtain input focus.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	469 */
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	470 if(strnicmp(tmpbuf, EDITCLASSNAME, strlen(EDITCLASSNAME)+1)==0 \|\| /* Entryfield */
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	471 strnicmp(tmpbuf, BUTTONCLASSNAME, strlen(BUTTONCLASSNAME)+1)==0 \|\| /* Button */
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	472 strnicmp(tmpbuf, COMBOBOXCLASSNAME, strlen(COMBOBOXCLASSNAME)+1)==0 \|\| /* Combobox */
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	473 strnicmp(tmpbuf, LISTBOXCLASSNAME, strlen(LISTBOXCLASSNAME)+1)==0 \|\| /* List box */
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	474 strnicmp(tmpbuf, UPDOWN_CLASS, strlen(UPDOWN_CLASS)+1)==0 \|\| /* Spinbutton */
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	475 strnicmp(tmpbuf, TRACKBAR_CLASS, strlen(TRACKBAR_CLASS)+1)==0 \|\| /* Slider */
68 8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	476 strnicmp(tmpbuf, WC_LISTVIEW, strlen(WC_LISTVIEW)+1)== 0 \|\| /* Container */
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	477 strnicmp(tmpbuf, WC_TREEVIEW, strlen(WC_TREEVIEW)+1)== 0) /* Tree */
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	478 return 1;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	479 return 0;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	480 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	481
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	482 HWND _normalize_handle(HWND handle)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	483 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	484 char tmpbuf[100] = "";
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	485
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	486 GetClassName(handle, tmpbuf, 99);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	487 if(strnicmp(tmpbuf, UPDOWN_CLASS, strlen(UPDOWN_CLASS))==0) /* Spinner */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	488 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	489 ColorInfo cinfo = (ColorInfo )GetWindowLongPtr(handle, GWLP_USERDATA);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	490
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	491 if(cinfo && cinfo->buddy)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	492 return cinfo->buddy;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	493 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	494 if(strnicmp(tmpbuf, COMBOBOXCLASSNAME, strlen(COMBOBOXCLASSNAME))==0) /* Combobox */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	495 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	496 ColorInfo cinfo = (ColorInfo )GetWindowLongPtr(handle, GWLP_USERDATA);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	497
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	498 if(cinfo && cinfo->buddy)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	499 return cinfo->buddy;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	500 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	501 return handle;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	502 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	503
34 b03b24bb95f8 Added dw_window_default() to set the default focus widget in a dialog. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 33 diff changeset	504 int _focus_check_box(Box *box, HWND handle, int start, HWND defaultitem)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	505 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	506 int z;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	507 static HWND lasthwnd, firsthwnd;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	508 static int finish_searching;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	509
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	510 /* Start is 2 when we have cycled completely and
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	511 * need to set the focus to the last widget we found
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	512 * that was valid.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	513 */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	514 if(start == 2)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	515 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	516 if(lasthwnd)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	517 SetFocus(lasthwnd);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	518 return 0;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	519 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	520
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	521 /* Start is 1 when we are entering the function
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	522 * for the first time, it is zero when entering
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	523 * the function recursively.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	524 */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	525 if(start == 1)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	526 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	527 lasthwnd = handle;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	528 finish_searching = 0;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	529 firsthwnd = 0;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	530 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	531
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	532 for(z=box->count-1;z>-1;z--)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	533 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	534 if(box->items[z].type == TYPEBOX)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	535 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	536 Box thisbox = (Box )GetWindowLongPtr(box->items[z].hwnd, GWLP_USERDATA);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	537
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	538 if(thisbox && _focus_check_box(thisbox, handle, start == 3 ? 3 : 0, defaultitem))
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	539 return 1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	540 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	541 else
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	542 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	543 if(box->items[z].hwnd == handle)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	544 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	545 if(lasthwnd == handle && firsthwnd)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	546 SetFocus(firsthwnd);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	547 else if(lasthwnd == handle && !firsthwnd)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	548 finish_searching = 1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	549 else
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	550 SetFocus(lasthwnd);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	551
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	552 /* If we aren't looking for the last handle,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	553 * return immediately.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	554 */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	555 if(!finish_searching)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	556 return 1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	557 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	558 if(_validate_focus(box->items[z].hwnd))
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	559 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	560 /* Start is 3 when we are looking for the
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	561 * first valid item in the layout.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	562 */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	563 if(start == 3)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	564 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	565 if(!defaultitem \|\| (defaultitem && box->items[z].hwnd == defaultitem))
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	566 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	567 SetFocus(_normalize_handle(box->items[z].hwnd));
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	568 return 1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	569 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	570 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	571
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	572 if(!firsthwnd)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	573 firsthwnd = _normalize_handle(box->items[z].hwnd);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	574
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	575 lasthwnd = _normalize_handle(box->items[z].hwnd);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	576 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	577 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	578 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	579 char tmpbuf[100] = "";
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	580
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	581 GetClassName(box->items[z].hwnd, tmpbuf, 99);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	582
153 a371875d5486 Sync up with the latest F/X sources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 151 diff changeset	583 if(strncmp(tmpbuf, SplitbarClassName, strlen(SplitbarClassName)+1)==0)
a371875d5486 Sync up with the latest F/X sources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 151 diff changeset	584 {
284 3431e445d831 Woops, screwed up the splitbar tab direction on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 283 diff changeset	585 /* Then try the bottom or right box */
3431e445d831 Woops, screwed up the splitbar tab direction on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 283 diff changeset	586 HWND mybox = (HWND)dw_window_get_data(box->items[z].hwnd, "_dw_bottomright");
153 a371875d5486 Sync up with the latest F/X sources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 151 diff changeset	587
a371875d5486 Sync up with the latest F/X sources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 151 diff changeset	588 if(mybox)
a371875d5486 Sync up with the latest F/X sources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 151 diff changeset	589 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	590 Box splitbox = (Box )GetWindowLongPtr(mybox, GWLP_USERDATA);
153 a371875d5486 Sync up with the latest F/X sources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 151 diff changeset	591
a371875d5486 Sync up with the latest F/X sources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 151 diff changeset	592 if(splitbox && _focus_check_box(splitbox, handle, start == 3 ? 3 : 0, defaultitem))
a371875d5486 Sync up with the latest F/X sources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 151 diff changeset	593 return 1;
a371875d5486 Sync up with the latest F/X sources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 151 diff changeset	594 }
a371875d5486 Sync up with the latest F/X sources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 151 diff changeset	595
284 3431e445d831 Woops, screwed up the splitbar tab direction on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 283 diff changeset	596 /* Try the top or left box */
3431e445d831 Woops, screwed up the splitbar tab direction on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 283 diff changeset	597 mybox = (HWND)dw_window_get_data(box->items[z].hwnd, "_dw_topleft");
153 a371875d5486 Sync up with the latest F/X sources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 151 diff changeset	598
a371875d5486 Sync up with the latest F/X sources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 151 diff changeset	599 if(mybox)
a371875d5486 Sync up with the latest F/X sources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 151 diff changeset	600 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	601 Box splitbox = (Box )GetWindowLongPtr(mybox, GWLP_USERDATA);
153 a371875d5486 Sync up with the latest F/X sources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 151 diff changeset	602
a371875d5486 Sync up with the latest F/X sources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 151 diff changeset	603 if(splitbox && _focus_check_box(splitbox, handle, start == 3 ? 3 : 0, defaultitem))
a371875d5486 Sync up with the latest F/X sources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 151 diff changeset	604 return 1;
a371875d5486 Sync up with the latest F/X sources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 151 diff changeset	605 }
a371875d5486 Sync up with the latest F/X sources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 151 diff changeset	606 }
a371875d5486 Sync up with the latest F/X sources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 151 diff changeset	607 else if(strnicmp(tmpbuf, WC_TABCONTROL, strlen(WC_TABCONTROL))==0) /* Notebook */
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	608 {
191 634625c3239d Fixes for dw_color_xxxx_set() to accept OS/2 style colors, and fixed a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 185 diff changeset	609 NotebookPage array = (NotebookPage )dw_window_get_data(box->items[z].hwnd, "_dw_array");
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	610 int pageid = TabCtrl_GetCurSel(box->items[z].hwnd);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	611
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	612 if(pageid > -1 && array && array[pageid])
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	613 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	614 Box *notebox;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	615
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	616 if(array[pageid]->hwnd)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	617 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	618 notebox = (Box *)GetWindowLongPtr(array[pageid]->hwnd, GWLP_USERDATA);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	619
34 b03b24bb95f8 Added dw_window_default() to set the default focus widget in a dialog. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 33 diff changeset	620 if(notebox && _focus_check_box(notebox, handle, start == 3 ? 3 : 0, defaultitem))
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	621 return 1;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	622 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	623 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	624 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	625 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	626 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	627 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	628 return 0;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	629 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	630
61 4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	631 int _focus_check_box_back(Box *box, HWND handle, int start, HWND defaultitem)
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	632 {
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	633 int z;
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	634 static HWND lasthwnd, firsthwnd;
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	635 static int finish_searching;
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	636
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	637 /* Start is 2 when we have cycled completely and
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	638 * need to set the focus to the last widget we found
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	639 * that was valid.
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	640 */
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	641 if(start == 2)
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	642 {
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	643 if(lasthwnd)
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	644 SetFocus(lasthwnd);
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	645 return 0;
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	646 }
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	647
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	648 /* Start is 1 when we are entering the function
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	649 * for the first time, it is zero when entering
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	650 * the function recursively.
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	651 */
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	652 if(start == 1)
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	653 {
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	654 lasthwnd = handle;
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	655 finish_searching = 0;
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	656 firsthwnd = 0;
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	657 }
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	658
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	659 for(z=0;z<box->count;z++)
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	660 {
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	661 if(box->items[z].type == TYPEBOX)
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	662 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	663 Box thisbox = (Box )GetWindowLongPtr(box->items[z].hwnd, GWLP_USERDATA);
61 4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	664
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	665 if(thisbox && _focus_check_box_back(thisbox, handle, start == 3 ? 3 : 0, defaultitem))
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	666 return 1;
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	667 }
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	668 else
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	669 {
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	670 if(box->items[z].hwnd == handle)
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	671 {
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	672 if(lasthwnd == handle && firsthwnd)
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	673 SetFocus(firsthwnd);
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	674 else if(lasthwnd == handle && !firsthwnd)
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	675 finish_searching = 1;
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	676 else
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	677 SetFocus(lasthwnd);
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	678
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	679 /* If we aren't looking for the last handle,
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	680 * return immediately.
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	681 */
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	682 if(!finish_searching)
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	683 return 1;
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	684 }
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	685 if(_validate_focus(box->items[z].hwnd))
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	686 {
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	687 /* Start is 3 when we are looking for the
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	688 * first valid item in the layout.
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	689 */
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	690 if(start == 3)
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	691 {
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	692 if(!defaultitem \|\| (defaultitem && box->items[z].hwnd == defaultitem))
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	693 {
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	694 SetFocus(_normalize_handle(box->items[z].hwnd));
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	695 return 1;
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	696 }
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	697 }
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	698
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	699 if(!firsthwnd)
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	700 firsthwnd = _normalize_handle(box->items[z].hwnd);
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	701
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	702 lasthwnd = _normalize_handle(box->items[z].hwnd);
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	703 }
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	704 else
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	705 {
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	706 char tmpbuf[100] = "";
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	707
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	708 GetClassName(box->items[z].hwnd, tmpbuf, 99);
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	709
283 54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	710 if(strncmp(tmpbuf, SplitbarClassName, strlen(SplitbarClassName)+1)==0)
54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	711 {
284 3431e445d831 Woops, screwed up the splitbar tab direction on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 283 diff changeset	712 /* Try the top or left box */
3431e445d831 Woops, screwed up the splitbar tab direction on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 283 diff changeset	713 HWND mybox = (HWND)dw_window_get_data(box->items[z].hwnd, "_dw_topleft");
283 54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	714
54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	715 if(mybox)
54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	716 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	717 Box splitbox = (Box )GetWindowLongPtr(mybox, GWLP_USERDATA);
283 54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	718
54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	719 if(splitbox && _focus_check_box_back(splitbox, handle, start == 3 ? 3 : 0, defaultitem))
54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	720 return 1;
54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	721 }
54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	722
284 3431e445d831 Woops, screwed up the splitbar tab direction on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 283 diff changeset	723 /* Then try the bottom or right box */
3431e445d831 Woops, screwed up the splitbar tab direction on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 283 diff changeset	724 mybox = (HWND)dw_window_get_data(box->items[z].hwnd, "_dw_bottomright");
283 54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	725
54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	726 if(mybox)
54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	727 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	728 Box splitbox = (Box )GetWindowLongPtr(mybox, GWLP_USERDATA);
283 54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	729
54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	730 if(splitbox && _focus_check_box_back(splitbox, handle, start == 3 ? 3 : 0, defaultitem))
54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	731 return 1;
54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	732 }
54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	733 }
54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	734 else if(strnicmp(tmpbuf, WC_TABCONTROL, strlen(WC_TABCONTROL))==0) /* Notebook */
61 4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	735 {
191 634625c3239d Fixes for dw_color_xxxx_set() to accept OS/2 style colors, and fixed a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 185 diff changeset	736 NotebookPage array = (NotebookPage )dw_window_get_data(box->items[z].hwnd, "_dw_array");
61 4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	737 int pageid = TabCtrl_GetCurSel(box->items[z].hwnd);
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	738
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	739 if(pageid > -1 && array && array[pageid])
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	740 {
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	741 Box *notebox;
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	742
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	743 if(array[pageid]->hwnd)
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	744 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	745 notebox = (Box *)GetWindowLongPtr(array[pageid]->hwnd, GWLP_USERDATA);
61 4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	746
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	747 if(notebox && _focus_check_box_back(notebox, handle, start == 3 ? 3 : 0, defaultitem))
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	748 return 1;
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	749 }
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	750 }
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	751 }
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	752 }
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	753 }
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	754 }
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	755 return 0;
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	756 }
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	757
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	758 /* This function finds the first widget in the
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	759 * layout and moves the current focus to it.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	760 */
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	761 void _initial_focus(HWND handle)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	762 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	763 Box *thisbox;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	764 char tmpbuf[100];
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	765
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	766 if(!handle)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	767 return;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	768
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	769 GetClassName(handle, tmpbuf, 99);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	770
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	771 if(strnicmp(tmpbuf, ClassName, strlen(ClassName))!=0)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	772 return;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	773
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	774
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	775 if(handle)
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	776 thisbox = (Box *)GetWindowLongPtr(handle, GWLP_USERDATA);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	777
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	778 if(thisbox)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	779 {
34 b03b24bb95f8 Added dw_window_default() to set the default focus widget in a dialog. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 33 diff changeset	780 _focus_check_box(thisbox, handle, 3, thisbox->defaultitem);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	781 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	782 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	783
301 887675ee5b67 More keypress fixes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 299 diff changeset	784 HWND _toplevel_window(HWND handle)
887675ee5b67 More keypress fixes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 299 diff changeset	785 {
887675ee5b67 More keypress fixes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 299 diff changeset	786 HWND box, lastbox = GetParent(handle);
887675ee5b67 More keypress fixes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 299 diff changeset	787
887675ee5b67 More keypress fixes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 299 diff changeset	788 /* Find the toplevel window */
887675ee5b67 More keypress fixes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 299 diff changeset	789 while((box = GetParent(lastbox)))
887675ee5b67 More keypress fixes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 299 diff changeset	790 {
887675ee5b67 More keypress fixes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 299 diff changeset	791 lastbox = box;
887675ee5b67 More keypress fixes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 299 diff changeset	792 }
887675ee5b67 More keypress fixes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 299 diff changeset	793 if(lastbox)
887675ee5b67 More keypress fixes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 299 diff changeset	794 return lastbox;
887675ee5b67 More keypress fixes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 299 diff changeset	795 return handle;
887675ee5b67 More keypress fixes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 299 diff changeset	796 }
887675ee5b67 More keypress fixes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 299 diff changeset	797
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	798 /* This function finds the current widget in the
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	799 * layout and moves the current focus to the next item.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	800 */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	801 void _shift_focus(HWND handle)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	802 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	803 Box *thisbox;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	804
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	805 HWND box, lastbox = GetParent(handle);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	806
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	807 /* Find the toplevel window */
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	808 while((box = GetParent(lastbox)))
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	809 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	810 lastbox = box;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	811 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	812
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	813 thisbox = (Box *)GetWindowLongPtr(lastbox, GWLP_USERDATA);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	814 if(thisbox)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	815 {
34 b03b24bb95f8 Added dw_window_default() to set the default focus widget in a dialog. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 33 diff changeset	816 if(_focus_check_box(thisbox, handle, 1, 0) == 0)
b03b24bb95f8 Added dw_window_default() to set the default focus widget in a dialog. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 33 diff changeset	817 _focus_check_box(thisbox, handle, 2, 0);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	818 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	819 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	820
61 4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	821 /* This function finds the current widget in the
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	822 * layout and moves the current focus to the next item.
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	823 */
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	824 void _shift_focus_back(HWND handle)
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	825 {
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	826 Box *thisbox;
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	827
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	828 HWND box, lastbox = GetParent(handle);
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	829
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	830 /* Find the toplevel window */
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	831 while((box = GetParent(lastbox)))
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	832 {
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	833 lastbox = box;
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	834 }
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	835
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	836 thisbox = (Box *)GetWindowLongPtr(lastbox, GWLP_USERDATA);
61 4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	837 if(thisbox)
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	838 {
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	839 if(_focus_check_box_back(thisbox, handle, 1, 0) == 0)
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	840 _focus_check_box_back(thisbox, handle, 2, 0);
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	841 }
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	842 }
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	843
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	844 /* ResetWindow:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	845 * Resizes window to the exact same size to trigger
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	846 * recalculation of frame.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	847 */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	848 void _ResetWindow(HWND hwndFrame)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	849 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	850 RECT rcl;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	851
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	852 GetWindowRect(hwndFrame, &rcl);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	853 SetWindowPos(hwndFrame, HWND_TOP, 0, 0, rcl.right - rcl.left,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	854 rcl.bottom - rcl.top - 1, SWP_NOMOVE \| SWP_NOZORDER);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	855 SetWindowPos(hwndFrame, HWND_TOP, 0, 0, rcl.right - rcl.left,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	856 rcl.bottom - rcl.top, SWP_NOMOVE \| SWP_NOZORDER);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	857 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	858
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	859 /* This function calculates how much space the widgets and boxes require
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	860 * and does expansion as necessary.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	861 */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	862 int _resize_box(Box thisbox, int depth, int x, int y, int usedx, int usedy,
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	863 int pass, int usedpadx, int usedpady)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	864 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	865 int z, currentx = 0, currenty = 0;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	866 int uymax = 0, uxmax = 0;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	867 int upymax = 0, upxmax = 0;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	868 /* Used for the SIZEEXPAND */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	869 int nux = usedx, nuy = usedy;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	870 int nupx = usedpadx, nupy = usedpady;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	871
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	872 (usedx) += (thisbox->pad 2);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	873 (usedy) += (thisbox->pad 2);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	874
416 a4197ddfc50d Changes to calculate groupbox border widths and take this into account bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 414 diff changeset	875 if(thisbox->grouphwnd)
a4197ddfc50d Changes to calculate groupbox border widths and take this into account bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 414 diff changeset	876 {
a4197ddfc50d Changes to calculate groupbox border widths and take this into account bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 414 diff changeset	877 char *text = dw_window_get_text(thisbox->grouphwnd);
a4197ddfc50d Changes to calculate groupbox border widths and take this into account bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 414 diff changeset	878
456 935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	879 thisbox->grouppady = 0;
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	880
416 a4197ddfc50d Changes to calculate groupbox border widths and take this into account bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 414 diff changeset	881 if(text)
a4197ddfc50d Changes to calculate groupbox border widths and take this into account bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 414 diff changeset	882 {
514 08d770271709 More function name changes for Rexx/DW compatibility. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 513 diff changeset	883 dw_font_text_extents_get(thisbox->grouphwnd, 0, text, NULL, &thisbox->grouppady);
416 a4197ddfc50d Changes to calculate groupbox border widths and take this into account bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 414 diff changeset	884 dw_free(text);
a4197ddfc50d Changes to calculate groupbox border widths and take this into account bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 414 diff changeset	885 }
a4197ddfc50d Changes to calculate groupbox border widths and take this into account bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 414 diff changeset	886
456 935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	887 if(thisbox->grouppady)
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	888 thisbox->grouppady += 3;
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	889 else
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	890 thisbox->grouppady = 6;
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	891
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	892 thisbox->grouppadx = 6;
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	893
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	894 (*usedx) += thisbox->grouppadx;
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	895 (*usedpadx) += thisbox->grouppadx;
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	896 (*usedy) += thisbox->grouppady;
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	897 (*usedpady) += thisbox->grouppady;
416 a4197ddfc50d Changes to calculate groupbox border widths and take this into account bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 414 diff changeset	898 }
a4197ddfc50d Changes to calculate groupbox border widths and take this into account bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 414 diff changeset	899
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	900 for(z=0;z<thisbox->count;z++)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	901 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	902 if(thisbox->items[z].type == TYPEBOX)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	903 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	904 int initialx, initialy;
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	905 Box tmp = (Box )GetWindowLongPtr(thisbox->items[z].hwnd, GWLP_USERDATA);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	906
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	907 initialx = x - (*usedx);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	908 initialy = y - (*usedy);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	909
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	910 if(tmp)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	911 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	912 int newx, newy;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	913 int nux = usedx, nuy = usedy;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	914 int upx = usedpadx + (tmp->pad2), upy = usedpady + (tmp->pad2);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	915
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	916 /* On the second pass we know how big the box needs to be and how
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	917 * much space we have, so we can calculate a ratio for the new box.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	918 */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	919 if(pass == 2)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	920 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	921 int deep = *depth + 1;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	922
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	923 _resize_box(tmp, &deep, x, y, &nux, &nuy, 1, &upx, &upy);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	924
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	925 tmp->upx = upx - *usedpadx;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	926 tmp->upy = upy - *usedpady;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	927
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	928 newx = x - nux;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	929 newy = y - nuy;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	930
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	931 tmp->width = thisbox->items[z].width = initialx - newx;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	932 tmp->height = thisbox->items[z].height = initialy - newy;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	933
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	934 tmp->parentxratio = thisbox->xratio;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	935 tmp->parentyratio = thisbox->yratio;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	936
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	937 tmp->parentpad = tmp->pad;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	938
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	939 /* Just in case */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	940 tmp->xratio = thisbox->xratio;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	941 tmp->yratio = thisbox->yratio;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	942
456 935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	943 if(thisbox->type == DW_VERT)
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	944 {
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	945 int tmppad = (thisbox->items[z].pad2)+(tmp->pad2)+tmp->grouppady;
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	946
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	947 if((thisbox->items[z].width - tmppad)!=0)
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	948 tmp->xratio = ((float)((thisbox->items[z].width * thisbox->xratio)-tmppad))/((float)(thisbox->items[z].width-tmppad));
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	949 }
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	950 else
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	951 {
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	952 if((thisbox->items[z].width-tmp->upx)!=0)
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	953 tmp->xratio = ((float)((thisbox->items[z].width * thisbox->xratio)-tmp->upx))/((float)(thisbox->items[z].width-tmp->upx));
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	954 }
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	955 if(thisbox->type == DW_HORZ)
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	956 {
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	957 int tmppad = (thisbox->items[z].pad2)+(tmp->pad2)+tmp->grouppadx;
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	958
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	959 if((thisbox->items[z].height-tmppad)!=0)
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	960 tmp->yratio = ((float)((thisbox->items[z].height * thisbox->yratio)-tmppad))/((float)(thisbox->items[z].height-tmppad));
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	961 }
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	962 else
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	963 {
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	964 if((thisbox->items[z].height-tmp->upy)!=0)
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	965 tmp->yratio = ((float)((thisbox->items[z].height * thisbox->yratio)-tmp->upy))/((float)(thisbox->items[z].height-tmp->upy));
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	966 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	967
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	968 nux = usedx; nuy = usedy;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	969 upx = usedpadx + (tmp->pad2); upy = usedpady + (tmp->pad2);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	970 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	971
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	972 (*depth)++;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	973
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	974 _resize_box(tmp, depth, x, y, &nux, &nuy, pass, &upx, &upy);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	975
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	976 (*depth)--;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	977
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	978 newx = x - nux;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	979 newy = y - nuy;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	980
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	981 tmp->minwidth = thisbox->items[z].width = initialx - newx;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	982 tmp->minheight = thisbox->items[z].height = initialy - newy;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	983 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	984 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	985
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	986 if(pass > 1 && *depth > 0)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	987 {
456 935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	988 if(thisbox->type == DW_VERT)
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	989 {
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	990 int tmppad = (thisbox->items[z].pad2)+(thisbox->parentpad2)+thisbox->grouppadx;
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	991
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	992 if((thisbox->minwidth-tmppad) == 0)
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	993 thisbox->items[z].xratio = 1.0;
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	994 else
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	995 thisbox->items[z].xratio = ((float)((thisbox->width * thisbox->parentxratio)-tmppad))/((float)(thisbox->minwidth-tmppad));
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	996 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	997 else
456 935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	998 {
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	999 if(thisbox->minwidth-thisbox->upx == 0)
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	1000 thisbox->items[z].xratio = 1.0;
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	1001 else
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	1002 thisbox->items[z].xratio = ((float)((thisbox->width * thisbox->parentxratio)-thisbox->upx))/((float)(thisbox->minwidth-thisbox->upx));
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	1003 }
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	1004
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	1005 if(thisbox->type == DW_HORZ)
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	1006 {
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	1007 int tmppad = (thisbox->items[z].pad2)+(thisbox->parentpad2)+thisbox->grouppady;
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	1008
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	1009 if((thisbox->minheight-tmppad) == 0)
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	1010 thisbox->items[z].yratio = 1.0;
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	1011 else
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	1012 thisbox->items[z].yratio = ((float)((thisbox->height * thisbox->parentyratio)-tmppad))/((float)(thisbox->minheight-tmppad));
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	1013 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1014 else
456 935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	1015 {
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	1016 if(thisbox->minheight-thisbox->upy == 0)
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	1017 thisbox->items[z].yratio = 1.0;
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	1018 else
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	1019 thisbox->items[z].yratio = ((float)((thisbox->height * thisbox->parentyratio)-thisbox->upy))/((float)(thisbox->minheight-thisbox->upy));
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	1020 }
22 6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	1021
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	1022 if(thisbox->items[z].type == TYPEBOX)
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	1023 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	1024 Box tmp = (Box )GetWindowLongPtr(thisbox->items[z].hwnd, GWLP_USERDATA);
22 6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	1025
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	1026 if(tmp)
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	1027 {
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	1028 tmp->parentxratio = thisbox->items[z].xratio;
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	1029 tmp->parentyratio = thisbox->items[z].yratio;
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	1030 }
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	1031 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1032 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1033 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1034 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1035 thisbox->items[z].xratio = thisbox->xratio;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1036 thisbox->items[z].yratio = thisbox->yratio;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1037 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1038
283 54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	1039 if(thisbox->type == DW_VERT)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1040 {
452 cf00d6e2b3cc Optimizations to the layout engine on OS/2 and Windows, eliminated 3 MUL bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 451 diff changeset	1041 int itemwidth = (thisbox->items[z].pad*2) + thisbox->items[z].width;
cf00d6e2b3cc Optimizations to the layout engine on OS/2 and Windows, eliminated 3 MUL bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 451 diff changeset	1042
cf00d6e2b3cc Optimizations to the layout engine on OS/2 and Windows, eliminated 3 MUL bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 451 diff changeset	1043 if(itemwidth > uxmax)
cf00d6e2b3cc Optimizations to the layout engine on OS/2 and Windows, eliminated 3 MUL bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 451 diff changeset	1044 uxmax = itemwidth;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1045 if(thisbox->items[z].hsize != SIZEEXPAND)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1046 {
452 cf00d6e2b3cc Optimizations to the layout engine on OS/2 and Windows, eliminated 3 MUL bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 451 diff changeset	1047 if(itemwidth > upxmax)
cf00d6e2b3cc Optimizations to the layout engine on OS/2 and Windows, eliminated 3 MUL bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 451 diff changeset	1048 upxmax = itemwidth;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1049 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1050 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1051 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1052 if(thisbox->items[z].pad*2 > upxmax)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1053 upxmax = thisbox->items[z].pad*2;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1054 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1055 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1056 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1057 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1058 if(thisbox->items[z].width == -1)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1059 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1060 /* figure out how much space this item requires */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1061 /* thisbox->items[z].width = */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1062 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1063 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1064 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1065 (usedx) += thisbox->items[z].width + (thisbox->items[z].pad2);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1066 if(thisbox->items[z].hsize != SIZEEXPAND)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1067 (usedpadx) += (thisbox->items[z].pad2) + thisbox->items[z].width;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1068 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1069 (usedpadx) += thisbox->items[z].pad2;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1070 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1071 }
283 54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	1072 if(thisbox->type == DW_HORZ)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1073 {
452 cf00d6e2b3cc Optimizations to the layout engine on OS/2 and Windows, eliminated 3 MUL bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 451 diff changeset	1074 int itemheight = (thisbox->items[z].pad*2) + thisbox->items[z].height;
cf00d6e2b3cc Optimizations to the layout engine on OS/2 and Windows, eliminated 3 MUL bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 451 diff changeset	1075
cf00d6e2b3cc Optimizations to the layout engine on OS/2 and Windows, eliminated 3 MUL bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 451 diff changeset	1076 if(itemheight > uymax)
cf00d6e2b3cc Optimizations to the layout engine on OS/2 and Windows, eliminated 3 MUL bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 451 diff changeset	1077 uymax = itemheight;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1078 if(thisbox->items[z].vsize != SIZEEXPAND)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1079 {
452 cf00d6e2b3cc Optimizations to the layout engine on OS/2 and Windows, eliminated 3 MUL bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 451 diff changeset	1080 if(itemheight > upymax)
cf00d6e2b3cc Optimizations to the layout engine on OS/2 and Windows, eliminated 3 MUL bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 451 diff changeset	1081 upymax = itemheight;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1082 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1083 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1084 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1085 if(thisbox->items[z].pad*2 > upymax)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1086 upymax = thisbox->items[z].pad*2;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1087 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1088 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1089 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1090 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1091 if(thisbox->items[z].height == -1)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1092 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1093 /* figure out how much space this item requires */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1094 /* thisbox->items[z].height = */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1095 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1096 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1097 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1098 (usedy) += thisbox->items[z].height + (thisbox->items[z].pad2);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1099 if(thisbox->items[z].vsize != SIZEEXPAND)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1100 (usedpady) += (thisbox->items[z].pad2) + thisbox->items[z].height;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1101 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1102 (usedpady) += thisbox->items[z].pad2;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1103 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1104 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1105 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1106
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1107 (*usedx) += uxmax;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1108 (*usedy) += uymax;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1109 (*usedpadx) += upxmax;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1110 (*usedpady) += upymax;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1111
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1112 currentx += thisbox->pad;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1113 currenty += thisbox->pad;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1114
416 a4197ddfc50d Changes to calculate groupbox border widths and take this into account bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 414 diff changeset	1115 if(thisbox->grouphwnd)
a4197ddfc50d Changes to calculate groupbox border widths and take this into account bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 414 diff changeset	1116 {
a4197ddfc50d Changes to calculate groupbox border widths and take this into account bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 414 diff changeset	1117 currentx += 3;
456 935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	1118 currenty += thisbox->grouppady - 3;
416 a4197ddfc50d Changes to calculate groupbox border widths and take this into account bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 414 diff changeset	1119 }
a4197ddfc50d Changes to calculate groupbox border widths and take this into account bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 414 diff changeset	1120
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1121 /* The second pass is for expansion and actual placement. */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1122 if(pass > 1)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1123 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1124 /* Any SIZEEXPAND items should be set to uxmax/uymax */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1125 for(z=0;z<thisbox->count;z++)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1126 {
283 54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	1127 if(thisbox->items[z].hsize == SIZEEXPAND && thisbox->type == DW_VERT)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1128 thisbox->items[z].width = uxmax-(thisbox->items[z].pad*2);
283 54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	1129 if(thisbox->items[z].vsize == SIZEEXPAND && thisbox->type == DW_HORZ)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1130 thisbox->items[z].height = uymax-(thisbox->items[z].pad*2);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1131 /* Run this code segment again to finalize the sized after setting uxmax/uymax values. */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1132 if(thisbox->items[z].type == TYPEBOX)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1133 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	1134 Box tmp = (Box )GetWindowLongPtr(thisbox->items[z].hwnd, GWLP_USERDATA);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1135
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1136 if(tmp)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1137 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1138 if(*depth > 0)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1139 {
425 4fe2df53ec9f Division by zero fix in the layout engine. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 421 diff changeset	1140 float calcval;
4fe2df53ec9f Division by zero fix in the layout engine. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 421 diff changeset	1141
283 54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	1142 if(thisbox->type == DW_VERT)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1143 {
425 4fe2df53ec9f Division by zero fix in the layout engine. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 421 diff changeset	1144 calcval = (float)(tmp->minwidth-((thisbox->items[z].pad2)+(thisbox->pad2)));
4fe2df53ec9f Division by zero fix in the layout engine. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 421 diff changeset	1145 if(calcval == 0.0)
4fe2df53ec9f Division by zero fix in the layout engine. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 421 diff changeset	1146 tmp->xratio = thisbox->xratio;
4fe2df53ec9f Division by zero fix in the layout engine. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 421 diff changeset	1147 else
4fe2df53ec9f Division by zero fix in the layout engine. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 421 diff changeset	1148 tmp->xratio = ((float)((thisbox->items[z].width * thisbox->xratio)-((thisbox->items[z].pad2)+(thisbox->pad2))))/calcval;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1149 tmp->width = thisbox->items[z].width;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1150 }
283 54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	1151 if(thisbox->type == DW_HORZ)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1152 {
425 4fe2df53ec9f Division by zero fix in the layout engine. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 421 diff changeset	1153 calcval = (float)(tmp->minheight-((thisbox->items[z].pad2)+(thisbox->pad2)));
4fe2df53ec9f Division by zero fix in the layout engine. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 421 diff changeset	1154 if(calcval == 0.0)
4fe2df53ec9f Division by zero fix in the layout engine. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 421 diff changeset	1155 tmp->yratio = thisbox->yratio;
4fe2df53ec9f Division by zero fix in the layout engine. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 421 diff changeset	1156 else
4fe2df53ec9f Division by zero fix in the layout engine. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 421 diff changeset	1157 tmp->yratio = ((float)((thisbox->items[z].height * thisbox->yratio)-((thisbox->items[z].pad2)+(thisbox->pad2))))/calcval;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1158 tmp->height = thisbox->items[z].height;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1159 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1160 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1161
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1162 (*depth)++;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1163
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1164 _resize_box(tmp, depth, x, y, &nux, &nuy, 3, &nupx, &nupy);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1165
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1166 (*depth)--;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1167
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1168 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1169 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1170 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1171
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1172 for(z=0;z<(thisbox->count);z++)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1173 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1174 int height = thisbox->items[z].height;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1175 int width = thisbox->items[z].width;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1176 int pad = thisbox->items[z].pad;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1177 HWND handle = thisbox->items[z].hwnd;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1178 int vectorx, vectory;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1179
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1180 /* When upxmax != pad2 then ratios are incorrect. /
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1181 vectorx = (int)((width*thisbox->items[z].xratio)-width);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1182 vectory = (int)((height*thisbox->items[z].yratio)-height);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1183
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1184 if(width > 0 && height > 0)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1185 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1186 char tmpbuf[100];
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1187 /* This is a hack to fix rounding of the sizing */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1188 if(*depth == 0)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1189 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1190 vectorx++;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1191 vectory++;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1192 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1193
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1194 /* If this item isn't going to expand... reset the vectors to 0 */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1195 if(thisbox->items[z].vsize != SIZEEXPAND)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1196 vectory = 0;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1197 if(thisbox->items[z].hsize != SIZEEXPAND)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1198 vectorx = 0;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1199
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1200 GetClassName(handle, tmpbuf, 99);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1201
88 58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1202 if(strnicmp(tmpbuf, COMBOBOXCLASSNAME, strlen(COMBOBOXCLASSNAME)+1)==0)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1203 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1204 /* Handle special case Combobox */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1205 MoveWindow(handle, currentx + pad, currenty + pad,
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	1206 width + vectorx, (height + vectory) + 400, FALSE);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1207 }
88 58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1208 else if(strnicmp(tmpbuf, UPDOWN_CLASS, strlen(UPDOWN_CLASS)+1)==0)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1209 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1210 /* Handle special case Spinbutton */
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	1211 ColorInfo cinfo = (ColorInfo )GetWindowLongPtr(handle, GWLP_USERDATA);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1212
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1213 MoveWindow(handle, currentx + pad + ((width + vectorx) - 20), currenty + pad,
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	1214 20, height + vectory, FALSE);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1215
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1216 if(cinfo)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1217 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1218 MoveWindow(cinfo->buddy, currentx + pad, currenty + pad,
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	1219 (width + vectorx) - 20, height + vectory, FALSE);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1220 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1221 }
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	1222 else if(strncmp(tmpbuf, SplitbarClassName, strlen(SplitbarClassName)+1)==0)
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	1223 {
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	1224 /* Then try the bottom or right box */
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	1225 float percent = (float )dw_window_get_data(handle, "_dw_percent");
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	1226 int type = (int)dw_window_get_data(handle, "_dw_type");
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	1227 int cx = width + vectorx;
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	1228 int cy = height + vectory;
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	1229
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	1230 MoveWindow(handle, currentx + pad, currenty + pad,
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	1231 cx, cy, FALSE);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	1232
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	1233 if(cx > 0 && cy > 0 && percent)
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	1234 _handle_splitbar_resize(handle, *percent, type, cx, cy);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	1235 }
88 58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1236 else if(strnicmp(tmpbuf, STATICCLASSNAME, strlen(STATICCLASSNAME)+1)==0)
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1237 {
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1238 /* Handle special case Vertically Center static text */
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	1239 ColorInfo cinfo = (ColorInfo )GetWindowLongPtr(handle, GWLP_USERDATA);
88 58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1240
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1241 if(cinfo && cinfo->vcenter)
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1242 {
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1243 /* We are centered so calculate a new position */
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1244 char tmpbuf[1024];
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1245 int textheight, diff, total = height + vectory;
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1246
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1247 GetWindowText(handle, tmpbuf, 1023);
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1248
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1249 /* Figure out how big the text is */
514 08d770271709 More function name changes for Rexx/DW compatibility. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 513 diff changeset	1250 dw_font_text_extents_get(handle, 0, tmpbuf, 0, &textheight);
88 58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1251
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1252 diff = (total - textheight) / 2;
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1253
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1254 MoveWindow(handle, currentx + pad, currenty + pad + diff,
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	1255 width + vectorx, height + vectory - diff, FALSE);
88 58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1256 }
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1257 else
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1258 {
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1259 MoveWindow(handle, currentx + pad, currenty + pad,
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	1260 width + vectorx, height + vectory, FALSE);
88 58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1261 }
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1262 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1263 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1264 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1265 /* Everything else */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1266 MoveWindow(handle, currentx + pad, currenty + pad,
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	1267 width + vectorx, height + vectory, FALSE);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1268 if(thisbox->items[z].type == TYPEBOX)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1269 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	1270 Box boxinfo = (Box )GetWindowLongPtr(handle, GWLP_USERDATA);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1271
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1272 if(boxinfo && boxinfo->grouphwnd)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1273 MoveWindow(boxinfo->grouphwnd, 0, 0,
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	1274 width + vectorx, height + vectory, FALSE);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1275
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1276 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1277 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1278
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1279 /* Notebook dialog requires additional processing */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1280 if(strncmp(tmpbuf, WC_TABCONTROL, strlen(WC_TABCONTROL))==0)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1281 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1282 RECT rect;
191 634625c3239d Fixes for dw_color_xxxx_set() to accept OS/2 style colors, and fixed a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 185 diff changeset	1283 NotebookPage array = (NotebookPage )dw_window_get_data(handle, "_dw_array");
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1284 int pageid = TabCtrl_GetCurSel(handle);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1285
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1286 if(pageid > -1 && array && array[pageid])
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1287 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1288 GetClientRect(handle,&rect);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1289 TabCtrl_AdjustRect(handle,FALSE,&rect);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1290 MoveWindow(array[pageid]->hwnd, rect.left, rect.top,
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	1291 rect.right - rect.left, rect.bottom-rect.top, FALSE);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1292 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1293 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1294
283 54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	1295 if(thisbox->type == DW_HORZ)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1296 currentx += width + vectorx + (pad * 2);
283 54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	1297 if(thisbox->type == DW_VERT)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1298 currenty += height + vectory + (pad * 2);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1299 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1300 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1301 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1302 return 0;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1303 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1304
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1305 void _do_resize(Box *thisbox, int x, int y)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1306 {
17 f26eced21a30 Some more updates. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 15 diff changeset	1307 if(x != 0 && y != 0)
f26eced21a30 Some more updates. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 15 diff changeset	1308 {
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1309 if(thisbox)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1310 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1311 int usedx = 0, usedy = 0, depth = 0, usedpadx = 0, usedpady = 0;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1312
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1313 _resize_box(thisbox, &depth, x, y, &usedx, &usedy, 1, &usedpadx, &usedpady);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1314
47 997e9ed670ef Fixes for box alignment problem on OS/2, crash in dw_bitmap_new() on unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 46 diff changeset	1315 if(usedx-usedpadx == 0 \|\| usedy-usedpady == 0)
997e9ed670ef Fixes for box alignment problem on OS/2, crash in dw_bitmap_new() on unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 46 diff changeset	1316 return;
997e9ed670ef Fixes for box alignment problem on OS/2, crash in dw_bitmap_new() on unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 46 diff changeset	1317
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1318 thisbox->xratio = ((float)(x-usedpadx))/((float)(usedx-usedpadx));
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1319 thisbox->yratio = ((float)(y-usedpady))/((float)(usedy-usedpady));
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1320
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1321 usedpadx = usedpady = usedx = usedy = depth = 0;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1322
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1323 _resize_box(thisbox, &depth, x, y, &usedx, &usedy, 2, &usedpadx, &usedpady);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1324 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1325 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1326 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1327
211 e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1328 int _HandleScroller(HWND handle, int pos, int which)
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1329 {
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1330 SCROLLINFO si;
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1331
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1332 si.cbSize = sizeof(SCROLLINFO);
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1333 si.fMask = SIF_ALL;
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1334
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1335 SendMessage(handle, SBM_GETSCROLLINFO, 0, (LPARAM)&si);
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1336
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1337 switch(which)
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1338 {
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1339 case SB_THUMBTRACK:
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1340 return pos;
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1341 /case SB_PAGEDOWN:/
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1342 case SB_PAGELEFT:
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1343 pos = si.nPos - si.nPage;
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1344 if(pos < si.nMin)
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1345 pos = si.nMin;
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1346 return pos;
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1347 /case SB_PAGEUP:/
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1348 case SB_PAGERIGHT:
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1349 pos = si.nPos + si.nPage;
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1350 if(pos > (si.nMax - si.nPage) + 1)
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1351 pos = (si.nMax - si.nPage) + 1;
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1352 return pos;
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1353 /case SB_LINEDOWN:/
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1354 case SB_LINELEFT:
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1355 pos = si.nPos - 1;
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1356 if(pos < si.nMin)
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1357 pos = si.nMin;
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1358 return pos;
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1359 /case SB_LINEUP:/
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1360 case SB_LINERIGHT:
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1361 pos = si.nPos + 1;
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1362 if(pos > (si.nMax - si.nPage) + 1)
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1363 pos = (si.nMax - si.nPage) + 1;
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1364 return pos;
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1365 }
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1366 return -1;
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1367 }
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1368
466 c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1369 HMENU _get_owner(HMENU menu)
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1370 {
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1371 MENUINFO mi;
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1372
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1373 mi.cbSize = sizeof(MENUINFO);
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1374 mi.fMask = MIM_MENUDATA;
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1375
506 f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	1376 if(MyGetMenuInfo(menu, &mi))
466 c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1377 return (HMENU)mi.dwMenuData;
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1378 return (HMENU)0;
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1379 }
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1380
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1381 /* Find the desktop window handle */
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1382 HMENU _menu_owner(HMENU handle)
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1383 {
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1384 HMENU menuowner = 0, lastowner = _get_owner(handle);
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1385
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1386 /* Find the toplevel menu */
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1387 while((menuowner = _get_owner(lastowner)) != 0)
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1388 {
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1389 if(menuowner == (HMENU)1)
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1390 return lastowner;
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1391 lastowner = menuowner;
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1392 }
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1393 return (HMENU)0;
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1394 }
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1395
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1396 /* The main window procedure for Dynamic Windows, all the resizing code is done here. */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1397 BOOL CALLBACK _wndproc(HWND hWnd, UINT msg, WPARAM mp1, LPARAM mp2)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1398 {
490 a9a09514dd56 Minor updates for the taskbar code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 487 diff changeset	1399 int result = -1, taskbar = FALSE;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1400 static int command_active = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1401 SignalHandler *tmp = Root;
182 b8caec82a4d2 Minor splitbar fixes on OS/2 and Windows. The splitbar width is now 4 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 181 diff changeset	1402 void (*windowfunc)(PVOID);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1403 ULONG origmsg = msg;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1404
295 aac3ab26d636 More key_press cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 294 diff changeset	1405 /* Deal with translating some messages */
490 a9a09514dd56 Minor updates for the taskbar code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 487 diff changeset	1406 if(msg == WM_USER+2)
a9a09514dd56 Minor updates for the taskbar code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 487 diff changeset	1407 {
a9a09514dd56 Minor updates for the taskbar code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 487 diff changeset	1408 taskbar = TRUE;
a9a09514dd56 Minor updates for the taskbar code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 487 diff changeset	1409 origmsg = msg = (UINT)mp2; /* no else here */
a9a09514dd56 Minor updates for the taskbar code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 487 diff changeset	1410 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1411 if(msg == WM_RBUTTONDOWN \|\| msg == WM_MBUTTONDOWN)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1412 msg = WM_LBUTTONDOWN;
295 aac3ab26d636 More key_press cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 294 diff changeset	1413 else if(msg == WM_RBUTTONUP \|\| msg == WM_MBUTTONUP)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1414 msg = WM_LBUTTONUP;
295 aac3ab26d636 More key_press cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 294 diff changeset	1415 else if(msg == WM_HSCROLL)
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1416 msg = WM_VSCROLL;
451 538b529052e0 Allow all special keys with keypress callback. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 449 diff changeset	1417 else if(msg == WM_KEYDOWN) /* && mp1 >= VK_F1 && mp1 <= VK_F24) allow ALL special keys */
295 aac3ab26d636 More key_press cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 294 diff changeset	1418 msg = WM_CHAR;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1419
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1420 if(result == -1)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1421 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1422 /* Avoid infinite recursion */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1423 command_active = 1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1424
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1425 /* Find any callbacks for this function */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1426 while(tmp)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1427 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1428 if(tmp->message == msg \|\| msg == WM_COMMAND \|\| msg == WM_NOTIFY \|\| tmp->message == WM_USER+1)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1429 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1430 switch(msg)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1431 {
197 f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	1432 case WM_TIMER:
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	1433 {
527 e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	1434 if(!hWnd)
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	1435 {
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	1436 int (timerfunc)(void ) = tmp->signalfunction;
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	1437 if(tmp->id == (int)mp1)
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	1438 {
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	1439 if(!timerfunc(tmp->data))
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	1440 dw_timer_disconnect(tmp->id);
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	1441 tmp = NULL;
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	1442 }
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	1443 }
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	1444 result = 0;
197 f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	1445 }
527 e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	1446 break;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1447 case WM_SETFOCUS:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1448 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1449 int (setfocusfunc)(HWND, void ) = (int ()(HWND, void ))tmp->signalfunction;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1450
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1451 if(hWnd == tmp->window)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1452 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1453 result = setfocusfunc(tmp->window, tmp->data);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1454 tmp = NULL;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1455 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1456 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1457 break;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1458 case WM_SIZE:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1459 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1460 int (sizefunc)(HWND, int, int, void ) = tmp->signalfunction;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1461
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1462 if(hWnd == tmp->window)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1463 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1464 result = sizefunc(tmp->window, LOWORD(mp2), HIWORD(mp2), tmp->data);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1465 tmp = NULL;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1466 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1467 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1468 break;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1469 case WM_LBUTTONDOWN:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1470 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1471 int (buttonfunc)(HWND, int, int, int, void ) = (int ()(HWND, int, int, int, void ))tmp->signalfunction;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1472
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1473 if(hWnd == tmp->window)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1474 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1475 int button;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1476
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1477 switch(origmsg)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1478 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1479 case WM_LBUTTONDOWN:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1480 button = 1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1481 break;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1482 case WM_RBUTTONDOWN:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1483 button = 2;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1484 break;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1485 case WM_MBUTTONDOWN:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1486 button = 3;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1487 break;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1488 }
490 a9a09514dd56 Minor updates for the taskbar code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 487 diff changeset	1489 if(taskbar)
a9a09514dd56 Minor updates for the taskbar code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 487 diff changeset	1490 {
a9a09514dd56 Minor updates for the taskbar code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 487 diff changeset	1491 POINT ptl;
a9a09514dd56 Minor updates for the taskbar code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 487 diff changeset	1492 GetCursorPos(&ptl);
a9a09514dd56 Minor updates for the taskbar code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 487 diff changeset	1493 result = buttonfunc(tmp->window, ptl.x, ptl.y, button, tmp->data);
a9a09514dd56 Minor updates for the taskbar code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 487 diff changeset	1494 }
a9a09514dd56 Minor updates for the taskbar code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 487 diff changeset	1495 else
a9a09514dd56 Minor updates for the taskbar code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 487 diff changeset	1496 {
a9a09514dd56 Minor updates for the taskbar code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 487 diff changeset	1497 POINTS pts = MAKEPOINTS(mp2);
a9a09514dd56 Minor updates for the taskbar code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 487 diff changeset	1498 result = buttonfunc(tmp->window, pts.x, pts.y, button, tmp->data);
a9a09514dd56 Minor updates for the taskbar code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 487 diff changeset	1499 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1500 tmp = NULL;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1501 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1502 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1503 break;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1504 case WM_LBUTTONUP:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1505 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1506 int (buttonfunc)(HWND, int, int, int, void ) = (int ()(HWND, int, int, int, void ))tmp->signalfunction;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1507
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1508 if(hWnd == tmp->window)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1509 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1510 int button;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1511
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1512 switch(origmsg)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1513 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1514 case WM_LBUTTONUP:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1515 button = 1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1516 break;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1517 case WM_RBUTTONUP:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1518 button = 2;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1519 break;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1520 case WM_MBUTTONUP:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1521 button = 3;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1522 break;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1523 }
490 a9a09514dd56 Minor updates for the taskbar code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 487 diff changeset	1524 if(taskbar)
a9a09514dd56 Minor updates for the taskbar code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 487 diff changeset	1525 {
a9a09514dd56 Minor updates for the taskbar code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 487 diff changeset	1526 POINT ptl;
a9a09514dd56 Minor updates for the taskbar code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 487 diff changeset	1527 GetCursorPos(&ptl);
a9a09514dd56 Minor updates for the taskbar code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 487 diff changeset	1528 result = buttonfunc(tmp->window, ptl.x, ptl.y, button, tmp->data);
a9a09514dd56 Minor updates for the taskbar code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 487 diff changeset	1529 }
a9a09514dd56 Minor updates for the taskbar code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 487 diff changeset	1530 else
a9a09514dd56 Minor updates for the taskbar code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 487 diff changeset	1531 {
a9a09514dd56 Minor updates for the taskbar code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 487 diff changeset	1532 POINTS pts = MAKEPOINTS(mp2);
a9a09514dd56 Minor updates for the taskbar code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 487 diff changeset	1533 result = buttonfunc(tmp->window, pts.x, pts.y, button, tmp->data);
a9a09514dd56 Minor updates for the taskbar code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 487 diff changeset	1534 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1535 tmp = NULL;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1536 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1537 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1538 break;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1539 case WM_MOUSEMOVE:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1540 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1541 POINTS pts = MAKEPOINTS(mp2);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1542 int (motionfunc)(HWND, int, int, int, void ) = (int ()(HWND, int, int, int, void ))tmp->signalfunction;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1543
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1544 if(hWnd == tmp->window)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1545 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1546 int keys = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1547
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1548 if (mp1 & MK_LBUTTON)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1549 keys = DW_BUTTON1_MASK;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1550 if (mp1 & MK_RBUTTON)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1551 keys \|= DW_BUTTON2_MASK;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1552 if (mp1 & MK_MBUTTON)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1553 keys \|= DW_BUTTON3_MASK;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1554
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1555 result = motionfunc(tmp->window, pts.x, pts.y, keys, tmp->data);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1556 tmp = NULL;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1557 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1558 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1559 break;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1560 case WM_CHAR:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1561 {
267 bf8b907f8a29 Added initial version of updated key_press_event callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 257 diff changeset	1562 int (keypressfunc)(HWND, char, int, int, void ) = tmp->signalfunction;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1563
301 887675ee5b67 More keypress fixes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 299 diff changeset	1564 if(hWnd == tmp->window \|\| _toplevel_window(hWnd) == tmp->window)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1565 {
267 bf8b907f8a29 Added initial version of updated key_press_event callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 257 diff changeset	1566 int special = 0;
295 aac3ab26d636 More key_press cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 294 diff changeset	1567 char ch = 0;
267 bf8b907f8a29 Added initial version of updated key_press_event callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 257 diff changeset	1568
bf8b907f8a29 Added initial version of updated key_press_event callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 257 diff changeset	1569 if(GetAsyncKeyState(VK_SHIFT) & 0x8000)
bf8b907f8a29 Added initial version of updated key_press_event callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 257 diff changeset	1570 special \|= KC_SHIFT;
bf8b907f8a29 Added initial version of updated key_press_event callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 257 diff changeset	1571 if(GetAsyncKeyState(VK_CONTROL) & 0x8000)
bf8b907f8a29 Added initial version of updated key_press_event callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 257 diff changeset	1572 special \|= KC_CTRL;
bf8b907f8a29 Added initial version of updated key_press_event callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 257 diff changeset	1573 if(mp2 & (1 << 29))
bf8b907f8a29 Added initial version of updated key_press_event callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 257 diff changeset	1574 special \|= KC_ALT;
bf8b907f8a29 Added initial version of updated key_press_event callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 257 diff changeset	1575
295 aac3ab26d636 More key_press cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 294 diff changeset	1576 if(origmsg == WM_CHAR && mp1 < 128)
aac3ab26d636 More key_press cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 294 diff changeset	1577 ch = (char)mp1;
aac3ab26d636 More key_press cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 294 diff changeset	1578
aac3ab26d636 More key_press cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 294 diff changeset	1579 result = keypressfunc(tmp->window, ch, mp1, special, tmp->data);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1580 tmp = NULL;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1581 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1582 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1583 break;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1584 case WM_CLOSE:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1585 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1586 int (closefunc)(HWND, void ) = tmp->signalfunction;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1587
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1588 if(hWnd == tmp->window)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1589 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1590 result = closefunc(tmp->window, tmp->data);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1591 tmp = NULL;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1592 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1593 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1594 break;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1595 case WM_PAINT:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1596 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1597 PAINTSTRUCT ps;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1598 DWExpose exp;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1599 int (exposefunc)(HWND, DWExpose , void *) = tmp->signalfunction;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1600
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1601 if(hWnd == tmp->window)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1602 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1603 BeginPaint(hWnd, &ps);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1604 exp.x = ps.rcPaint.left;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1605 exp.y = ps.rcPaint.top;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1606 exp.width = ps.rcPaint.right - ps.rcPaint.left;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1607 exp.height = ps.rcPaint.bottom - ps.rcPaint.top;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1608 result = exposefunc(hWnd, &exp, tmp->data);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1609 EndPaint(hWnd, &ps);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1610 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1611 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1612 break;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1613 case WM_NOTIFY:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1614 {
481 97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	1615 if(tmp->message == TVN_SELCHANGED \|\|
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	1616 tmp->message == NM_RCLICK \|\|
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	1617 tmp->message == TVN_ITEMEXPANDED)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1618 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1619 NMTREEVIEW FAR tem=(NMTREEVIEW FAR )mp2;
502 56ea525c1a24 Only activate the container select callback when the item state changes, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 496 diff changeset	1620 NMLISTVIEW FAR lem=(NMLISTVIEW FAR )mp2;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1621 char tmpbuf[100];
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1622
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1623 GetClassName(tem->hdr.hwndFrom, tmpbuf, 99);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1624
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1625 if(strnicmp(tmpbuf, WC_TREEVIEW, strlen(WC_TREEVIEW))==0)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1626 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1627 if(tem->hdr.code == TVN_SELCHANGED && tmp->message == TVN_SELCHANGED)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1628 {
321 be76b984620a Make sure dw_tree_item_select() does not cause a DW_SIGNAL_ITEM_SELECT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 318 diff changeset	1629 if(tmp->window == tem->hdr.hwndFrom && !dw_window_get_data(tmp->window, "_dw_select_item"))
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1630 {
481 97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	1631 int (treeselectfunc)(HWND, HTREEITEM, char , void , void ) = tmp->signalfunction;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1632 TVITEM tvi;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1633 void **ptrs;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1634
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1635 tvi.mask = TVIF_HANDLE;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1636 tvi.hItem = tem->itemNew.hItem;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1637
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1638 TreeView_GetItem(tmp->window, &tvi);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1639
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1640 ptrs = (void **)tvi.lParam;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1641 if(ptrs)
481 97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	1642 result = treeselectfunc(tmp->window, tem->itemNew.hItem, (char )ptrs[0], tmp->data, (void )ptrs[1]);
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	1643
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	1644 tmp = NULL;
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	1645 }
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	1646 }
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	1647 else if(tem->hdr.code == TVN_ITEMEXPANDED && tmp->message == TVN_ITEMEXPANDED)
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	1648 {
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	1649 if(tmp->window == tem->hdr.hwndFrom && tem->action == TVE_EXPAND)
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	1650 {
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	1651 int (treeexpandfunc)(HWND, HTREEITEM, void ) = tmp->signalfunction;
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	1652
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	1653 result = treeexpandfunc(tmp->window, tem->itemNew.hItem, tmp->data);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1654 tmp = NULL;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1655 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1656 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1657 else if(tem->hdr.code == NM_RCLICK && tmp->message == NM_RCLICK)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1658 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1659 if(tmp->window == tem->hdr.hwndFrom)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1660 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1661 int (containercontextfunc)(HWND, char , int, int, void , void ) = tmp->signalfunction;
341 503d1ac958bb Call TreeView_SelectItem() instead of dw_tree_item_select() so we get the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 339 diff changeset	1662 HTREEITEM hti, last;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1663 TVITEM tvi;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1664 TVHITTESTINFO thi;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1665 void **ptrs = NULL;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1666 LONG x, y;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1667
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1668 dw_pointer_query_pos(&x, &y);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1669
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1670 thi.pt.x = x;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1671 thi.pt.y = y;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1672
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1673 MapWindowPoints(HWND_DESKTOP, tmp->window, &thi.pt, 1);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1674
341 503d1ac958bb Call TreeView_SelectItem() instead of dw_tree_item_select() so we get the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 339 diff changeset	1675 last = TreeView_GetSelection(tmp->window);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1676 hti = TreeView_HitTest(tmp->window, &thi);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1677
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1678 if(hti)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1679 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1680 tvi.mask = TVIF_HANDLE;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1681 tvi.hItem = hti;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1682
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1683 TreeView_GetItem(tmp->window, &tvi);
341 503d1ac958bb Call TreeView_SelectItem() instead of dw_tree_item_select() so we get the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 339 diff changeset	1684 TreeView_SelectItem(tmp->window, hti);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1685
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1686 ptrs = (void **)tvi.lParam;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1687 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1688 containercontextfunc(tmp->window, ptrs ? (char *)ptrs[0] : NULL, x, y, tmp->data, ptrs ? ptrs[1] : NULL);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1689 tmp = NULL;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1690 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1691 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1692 }
161 c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1693 else if(strnicmp(tmpbuf, WC_LISTVIEW, strlen(WC_LISTVIEW)+1)==0)
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1694 {
502 56ea525c1a24 Only activate the container select callback when the item state changes, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 496 diff changeset	1695 if((lem->hdr.code == LVN_ITEMCHANGED && (lem->uChanged & LVIF_STATE)) && tmp->message == TVN_SELCHANGED)
161 c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1696 {
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1697 if(tmp->window == tem->hdr.hwndFrom)
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1698 {
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1699 LV_ITEM lvi;
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1700 int iItem;
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1701
350 2216e65ad2ae Removed slider flags and container selection flags from the header file. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 346 diff changeset	1702 iItem = ListView_GetNextItem(tmp->window, -1, LVNI_SELECTED);
161 c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1703
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1704 memset(&lvi, 0, sizeof(LV_ITEM));
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1705
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1706 if(iItem > -1)
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1707 {
311 24c1dfffe97e Unified the callback functions for tree and container widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 310 diff changeset	1708 int (treeselectfunc)(HWND, HWND, char , void , void ) = tmp->signalfunction;
161 c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1709
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1710 lvi.iItem = iItem;
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1711 lvi.mask = LVIF_PARAM;
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1712
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1713 ListView_GetItem(tmp->window, &lvi);
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1714
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1715 /* Seems to be having lParam as 1 which really sucks */
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1716 if(lvi.lParam < 100)
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1717 lvi.lParam = 0;
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1718
311 24c1dfffe97e Unified the callback functions for tree and container widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 310 diff changeset	1719 treeselectfunc(tmp->window, 0, (char *)lvi.lParam, tmp->data, 0);
161 c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1720 tmp = NULL;
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1721 }
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1722 }
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1723 }
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1724 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1725 }
332 7b0f00729a32 Implement switch-page signal for notebooks. Bit of a bug in that it fires mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 328 diff changeset	1726 else if(tmp->message == TCN_SELCHANGE)
7b0f00729a32 Implement switch-page signal for notebooks. Bit of a bug in that it fires mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 328 diff changeset	1727 {
7b0f00729a32 Implement switch-page signal for notebooks. Bit of a bug in that it fires mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 328 diff changeset	1728 NMHDR FAR tem=(NMHDR FAR )mp2;
334 0a15a1f3fbed Check that the notification message is actually TCN_SELCHANGE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 332 diff changeset	1729 if(tmp->window == tem->hwndFrom && tem->code == tmp->message)
332 7b0f00729a32 Implement switch-page signal for notebooks. Bit of a bug in that it fires mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 328 diff changeset	1730 {
346 81fae15885d7 Implemented switch-page on OS/2, and changed the signal prototype to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 344 diff changeset	1731 int (switchpagefunc)(HWND, unsigned long, void ) = tmp->signalfunction;
510 710f82598210 Change function names to be inline with Mark Hessling's Rexx/DW. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 509 diff changeset	1732 unsigned long num=dw_notebook_page_get(tem->hwndFrom);
332 7b0f00729a32 Implement switch-page signal for notebooks. Bit of a bug in that it fires mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 328 diff changeset	1733 result = switchpagefunc(tem->hwndFrom, num, tmp->data);
346 81fae15885d7 Implemented switch-page on OS/2, and changed the signal prototype to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 344 diff changeset	1734 tmp = NULL;
332 7b0f00729a32 Implement switch-page signal for notebooks. Bit of a bug in that it fires mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 328 diff changeset	1735 }
7b0f00729a32 Implement switch-page signal for notebooks. Bit of a bug in that it fires mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 328 diff changeset	1736 }
473 fc0341624711 Add support for column-click signal. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 469 diff changeset	1737 else if(tmp->message == LVN_COLUMNCLICK)
fc0341624711 Add support for column-click signal. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 469 diff changeset	1738 {
fc0341624711 Add support for column-click signal. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 469 diff changeset	1739 NMLISTVIEW FAR tem=(NMLISTVIEW FAR )mp2;
fc0341624711 Add support for column-click signal. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 469 diff changeset	1740 if(tmp->window == tem->hdr.hwndFrom && tem->hdr.code == tmp->message)
fc0341624711 Add support for column-click signal. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 469 diff changeset	1741 {
fc0341624711 Add support for column-click signal. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 469 diff changeset	1742 int (columnclickfunc)(HWND, int, void ) = tmp->signalfunction;
fc0341624711 Add support for column-click signal. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 469 diff changeset	1743 result = columnclickfunc(tem->hdr.hwndFrom, tem->iSubItem, tmp->data);
fc0341624711 Add support for column-click signal. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 469 diff changeset	1744 tmp = NULL;
fc0341624711 Add support for column-click signal. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 469 diff changeset	1745 }
fc0341624711 Add support for column-click signal. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 469 diff changeset	1746 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1747 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1748 break;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1749 case WM_COMMAND:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1750 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1751 int (clickfunc)(HWND, void ) = tmp->signalfunction;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1752 HWND command;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1753 ULONG passthru = (ULONG)LOWORD(mp1);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1754 ULONG message = HIWORD(mp1);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1755
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1756 command = (HWND)passthru;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1757
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1758 if(message == LBN_SELCHANGE \|\| message == CBN_SELCHANGE)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1759 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1760 int (listboxselectfunc)(HWND, int, void ) = tmp->signalfunction;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1761
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1762 if(tmp->message == LBN_SELCHANGE && tmp->window == (HWND)mp2)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1763 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1764 result = listboxselectfunc(tmp->window, dw_listbox_selected(tmp->window), tmp->data);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1765 tmp = NULL;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1766 }
466 c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1767 }
506 f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	1768 else if(!IS_WINNTOR95 && tmp->id && passthru == tmp->id)
466 c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1769 {
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1770 HMENU hwndmenu = GetMenu(hWnd), menuowner = _menu_owner((HMENU)tmp->window);
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1771
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1772 if(menuowner == hwndmenu \|\| !menuowner)
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1773 {
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1774 result = clickfunc(tmp->window, tmp->data);
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1775 tmp = NULL;
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1776 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1777 } /* Make sure it's the right window, and the right ID */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1778 else if(tmp->window < (HWND)65536 && command == tmp->window)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1779 {
93 98cce029a611 Changed handling of menu item click events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 90 diff changeset	1780 result = clickfunc(popup ? popup : tmp->window, tmp->data);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1781 tmp = NULL;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1782 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1783 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1784 break;
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1785 case WM_HSCROLL:
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1786 case WM_VSCROLL:
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1787 {
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1788 char tmpbuf[100];
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1789 HWND handle = (HWND)mp2;
204 098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	1790 int (valuechangefunc)(HWND, int, void ) = tmp->signalfunction;
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1791
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1792 GetClassName(handle, tmpbuf, 99);
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1793
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1794 if(strnicmp(tmpbuf, TRACKBAR_CLASS, strlen(TRACKBAR_CLASS)+1)==0)
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1795 {
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1796
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1797 if(handle == tmp->window)
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1798 {
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1799 int value = (int)SendMessage(handle, TBM_GETPOS, 0, 0);
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1800 int max = (int)SendMessage(handle, TBM_GETRANGEMAX, 0, 0);
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1801 ULONG currentstyle = GetWindowLong(handle, GWL_STYLE);
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1802
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1803 if(currentstyle & TBS_VERT)
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1804 result = valuechangefunc(tmp->window, max - value, tmp->data);
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1805 else
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1806 result = valuechangefunc(tmp->window, value, tmp->data);
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1807 tmp = NULL;
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1808 }
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1809 }
204 098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	1810 else if(strnicmp(tmpbuf, SCROLLBARCLASSNAME, strlen(SCROLLBARCLASSNAME)+1)==0)
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	1811 {
211 e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1812 if(handle == tmp->window)
204 098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	1813 {
211 e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1814 int value = _HandleScroller(handle, (int)HIWORD(mp1), (int)LOWORD(mp1));
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1815
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1816 if(value > -1)
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1817 {
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1818 dw_scrollbar_set_pos(tmp->window, value);
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1819 result = valuechangefunc(tmp->window, value, tmp->data);
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1820 }
204 098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	1821 tmp = NULL;
211 e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1822 msg = 0;
204 098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	1823 }
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	1824 }
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1825 }
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1826 break;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1827 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1828 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1829 if(tmp)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1830 tmp = tmp->next;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1831 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1832 command_active = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1833 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1834
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1835 /* Now that any handlers are done... do normal processing */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1836 switch( msg )
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1837 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1838 case WM_PAINT:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1839 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1840 PAINTSTRUCT ps;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1841
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1842 BeginPaint(hWnd, &ps);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1843 EndPaint(hWnd, &ps);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1844 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1845 break;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1846 case WM_SIZE:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1847 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1848 static int lastx = -1, lasty = -1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1849 static HWND lasthwnd = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1850
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1851 if(lastx != LOWORD(mp2) \|\| lasty != HIWORD(mp2) \|\| lasthwnd != hWnd)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1852 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	1853 Box mybox = (Box )GetWindowLongPtr(hWnd, GWLP_USERDATA);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1854
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1855 if(mybox && mybox->count)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1856 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1857 lastx = LOWORD(mp2);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1858 lasty = HIWORD(mp2);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1859 lasthwnd = hWnd;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1860
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1861 ShowWindow(mybox->items[0].hwnd, SW_HIDE);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1862 _do_resize(mybox,LOWORD(mp2),HIWORD(mp2));
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1863 ShowWindow(mybox->items[0].hwnd, SW_SHOW);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1864 return 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1865 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1866 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1867 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1868 break;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1869 case WM_CHAR:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1870 if(LOWORD(mp1) == '\t')
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1871 {
82 aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	1872 if(GetAsyncKeyState(VK_SHIFT) & 0x8000)
61 4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	1873 _shift_focus_back(hWnd);
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	1874 else
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	1875 _shift_focus(hWnd);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1876 return TRUE;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1877 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1878 break;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1879 case WM_USER:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1880 windowfunc = (void *)mp1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1881
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1882 if(windowfunc)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1883 windowfunc((void *)mp2);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1884 break;
467 ecf1df2edcee Cleanup code needs to delayed by posting to the window procedure so that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 466 diff changeset	1885 case WM_USER+5:
468 0a2f13ba2d5c More menu fixes, free signal handlers and memory on OS/2, and the begining bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 467 diff changeset	1886 _free_menu_data((HMENU)mp1);
0a2f13ba2d5c More menu fixes, free signal handlers and memory on OS/2, and the begining bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 467 diff changeset	1887 DestroyMenu((HMENU)mp1);
467 ecf1df2edcee Cleanup code needs to delayed by posting to the window procedure so that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 466 diff changeset	1888 break;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1889 case WM_NOTIFY:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1890 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1891 NMHDR FAR tem=(NMHDR FAR )mp2;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1892
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1893 if(tem->code == TCN_SELCHANGING)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1894 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1895 int num=TabCtrl_GetCurSel(tem->hwndFrom);
191 634625c3239d Fixes for dw_color_xxxx_set() to accept OS/2 style colors, and fixed a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 185 diff changeset	1896 NotebookPage array = (NotebookPage )dw_window_get_data(tem->hwndFrom, "_dw_array");
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1897
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1898 if(num > -1 && array && array[num])
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1899 SetParent(array[num]->hwnd, DW_HWND_OBJECT);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1900
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1901 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1902 else if(tem->code == TCN_SELCHANGE)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1903 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1904 int num=TabCtrl_GetCurSel(tem->hwndFrom);
191 634625c3239d Fixes for dw_color_xxxx_set() to accept OS/2 style colors, and fixed a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 185 diff changeset	1905 NotebookPage array = (NotebookPage )dw_window_get_data(tem->hwndFrom, "_dw_array");
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1906
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1907 if(num > -1 && array && array[num])
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1908 SetParent(array[num]->hwnd, tem->hwndFrom);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1909
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1910 _resize_notebook_page(tem->hwndFrom, num);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1911 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1912 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1913 break;
204 098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	1914 case WM_HSCROLL:
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	1915 case WM_VSCROLL:
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	1916 {
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	1917 HWND handle = (HWND)mp2;
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	1918
211 e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1919 if(dw_window_get_data(handle, "_dw_scrollbar"))
204 098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	1920 {
211 e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1921 int value = _HandleScroller(handle, (int)HIWORD(mp1), (int)LOWORD(mp1));
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1922
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1923 if(value > -1)
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1924 dw_scrollbar_set_pos(handle, value);
204 098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	1925 }
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	1926 }
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	1927 break;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1928 case WM_GETMINMAXINFO:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1929 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1930 MINMAXINFO info = (MINMAXINFO )mp2;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1931 info->ptMinTrackSize.x = 8;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1932 info->ptMinTrackSize.y = 8;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1933 return 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1934 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1935 break;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1936 case WM_DESTROY:
469 7952b9c1dc07 Free menu memory on Windows as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 468 diff changeset	1937 {
7952b9c1dc07 Free menu memory on Windows as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 468 diff changeset	1938 HMENU menu = GetMenu(hWnd);
7952b9c1dc07 Free menu memory on Windows as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 468 diff changeset	1939
7952b9c1dc07 Free menu memory on Windows as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 468 diff changeset	1940 if(menu)
7952b9c1dc07 Free menu memory on Windows as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 468 diff changeset	1941 _free_menu_data(menu);
7952b9c1dc07 Free menu memory on Windows as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 468 diff changeset	1942
7952b9c1dc07 Free menu memory on Windows as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 468 diff changeset	1943 /* Free memory before destroying */
7952b9c1dc07 Free menu memory on Windows as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 468 diff changeset	1944 _free_window_memory(hWnd, 0);
7952b9c1dc07 Free menu memory on Windows as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 468 diff changeset	1945 EnumChildWindows(hWnd, _free_window_memory, 0);
7952b9c1dc07 Free menu memory on Windows as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 468 diff changeset	1946 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1947 break;
527 e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	1948 case WM_MOUSEMOVE:
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	1949 {
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	1950 HCURSOR cursor;
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	1951
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	1952 if((cursor = (HCURSOR)dw_window_get_data(hWnd, "_dw_cursor")) \|\|
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	1953 (cursor = (HCURSOR)dw_window_get_data(_toplevel_window(hWnd), "_dw_cursor")))
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	1954 {
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	1955 SetCursor(cursor);
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	1956 }
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	1957 }
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	1958 break;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1959 case WM_CTLCOLORSTATIC:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1960 case WM_CTLCOLORLISTBOX:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1961 case WM_CTLCOLORBTN:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1962 case WM_CTLCOLOREDIT:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1963 case WM_CTLCOLORMSGBOX:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1964 case WM_CTLCOLORSCROLLBAR:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1965 case WM_CTLCOLORDLG:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1966 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	1967 ColorInfo thiscinfo = (ColorInfo )GetWindowLongPtr((HWND)mp2, GWLP_USERDATA);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1968 if(thiscinfo && thiscinfo->fore != -1 && thiscinfo->back != -1)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1969 {
155 840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1970 /* Handle foreground */
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1971 if(thiscinfo->fore > -1 && thiscinfo->fore < 18)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1972 {
155 840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1973 if(thiscinfo->fore != DW_CLR_DEFAULT)
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1974 {
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1975 SetTextColor((HDC)mp1, RGB(_red[thiscinfo->fore],
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1976 _green[thiscinfo->fore],
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1977 _blue[thiscinfo->fore]));
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1978 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1979 }
155 840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1980 else if((thiscinfo->fore & DW_RGB_COLOR) == DW_RGB_COLOR)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1981 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1982 SetTextColor((HDC)mp1, RGB(DW_RED_VALUE(thiscinfo->fore),
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1983 DW_GREEN_VALUE(thiscinfo->fore),
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1984 DW_BLUE_VALUE(thiscinfo->fore)));
155 840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1985 }
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1986 /* Handle background */
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1987 if(thiscinfo->back > -1 && thiscinfo->back < 18)
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1988 {
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1989 if(thiscinfo->back == DW_CLR_DEFAULT)
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1990 {
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1991 HBRUSH hbr = GetSysColorBrush(COLOR_3DFACE);
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1992
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1993 SelectObject((HDC)mp1, hbr);
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1994 return (LONG)hbr;
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1995 }
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1996 else
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1997 {
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1998 SetBkColor((HDC)mp1, RGB(_red[thiscinfo->back],
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1999 _green[thiscinfo->back],
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2000 _blue[thiscinfo->back]));
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2001 if(thiscinfo->hbrush)
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2002 DeleteObject(thiscinfo->hbrush);
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2003 thiscinfo->hbrush = CreateSolidBrush(RGB(_red[thiscinfo->back],
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2004 _green[thiscinfo->back],
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2005 _blue[thiscinfo->back]));
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2006 SelectObject((HDC)mp1, thiscinfo->hbrush);
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2007 }
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2008 return (LONG)thiscinfo->hbrush;
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2009 }
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2010 else if((thiscinfo->back & DW_RGB_COLOR) == DW_RGB_COLOR)
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2011 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2012 SetBkColor((HDC)mp1, RGB(DW_RED_VALUE(thiscinfo->back),
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2013 DW_GREEN_VALUE(thiscinfo->back),
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2014 DW_BLUE_VALUE(thiscinfo->back)));
82 aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	2015 if(thiscinfo->hbrush)
aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	2016 DeleteObject(thiscinfo->hbrush);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2017 thiscinfo->hbrush = CreateSolidBrush(RGB(DW_RED_VALUE(thiscinfo->back),
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2018 DW_GREEN_VALUE(thiscinfo->back),
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2019 DW_BLUE_VALUE(thiscinfo->back)));
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2020 SelectObject((HDC)mp1, thiscinfo->hbrush);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2021 return (LONG)thiscinfo->hbrush;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2022 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2023 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2024
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2025 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2026 break;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2027 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2028 if(result != -1)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2029 return result;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2030 else
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2031 return DefWindowProc(hWnd, msg, mp1, mp2);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2032 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2033
461 12ba7e744560 Fixes timer problems on Windows, however this may break Win95 support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 456 diff changeset	2034 VOID CALLBACK _TimerProc(HWND hwnd, UINT msg, UINT_PTR idEvent, DWORD dwTime)
12ba7e744560 Fixes timer problems on Windows, however this may break Win95 support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 456 diff changeset	2035 {
12ba7e744560 Fixes timer problems on Windows, however this may break Win95 support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 456 diff changeset	2036 _wndproc(hwnd, msg, (WPARAM)idEvent, 0);
12ba7e744560 Fixes timer problems on Windows, however this may break Win95 support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 456 diff changeset	2037 }
12ba7e744560 Fixes timer problems on Windows, however this may break Win95 support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 456 diff changeset	2038
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2039 BOOL CALLBACK _framewndproc(HWND hWnd, UINT msg, WPARAM mp1, LPARAM mp2)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2040 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2041 switch( msg )
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2042 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2043 case WM_LBUTTONDOWN:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2044 case WM_MBUTTONDOWN:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2045 case WM_RBUTTONDOWN:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2046 SetActiveWindow(hWnd);
106 4b6799f3dbbc Give the frame window focus if it is clicked on. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 105 diff changeset	2047 SetFocus(hWnd);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2048 break;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2049 case WM_COMMAND:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2050 case WM_NOTIFY:
527 e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	2051 case WM_MOUSEMOVE:
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2052 _wndproc(hWnd, msg, mp1, mp2);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2053 break;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2054 #if 0
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2055 case WM_ERASEBKGND:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2056 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	2057 ColorInfo thiscinfo = (ColorInfo )GetWindowLongPtr(hWnd, GWLP_USERDATA);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2058
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2059 if(thiscinfo && thiscinfo->fore != -1 && thiscinfo->back != -1)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2060 return FALSE;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2061 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2062 break;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2063 #endif
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2064 case WM_PAINT:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2065 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	2066 ColorInfo thiscinfo = (ColorInfo )GetWindowLongPtr(hWnd, GWLP_USERDATA);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2067
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2068 if(thiscinfo && thiscinfo->fore != -1 && thiscinfo->back != -1)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2069 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2070 PAINTSTRUCT ps;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2071 HDC hdcPaint = BeginPaint(hWnd, &ps);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2072 int success = FALSE;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2073
155 840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2074 if(thiscinfo && thiscinfo->fore != -1 && thiscinfo->back != -1)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2075 {
155 840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2076 /* Handle foreground */
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2077 if(thiscinfo->fore > -1 && thiscinfo->fore < 18)
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2078 {
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2079 if(thiscinfo->fore != DW_CLR_DEFAULT)
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2080 {
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2081 SetTextColor((HDC)mp1, RGB(_red[thiscinfo->fore],
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2082 _green[thiscinfo->fore],
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2083 _blue[thiscinfo->fore]));
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2084 }
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2085 }
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2086 else if((thiscinfo->fore & DW_RGB_COLOR) == DW_RGB_COLOR)
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2087 {
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2088 SetTextColor((HDC)mp1, RGB(DW_RED_VALUE(thiscinfo->fore),
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2089 DW_GREEN_VALUE(thiscinfo->fore),
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2090 DW_BLUE_VALUE(thiscinfo->fore)));
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2091 }
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2092 /* Handle background */
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2093 if(thiscinfo->back > -1 && thiscinfo->back < 18)
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2094 {
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2095 if(thiscinfo->back != DW_CLR_DEFAULT)
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2096 {
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2097 SetBkColor((HDC)mp1, RGB(_red[thiscinfo->back],
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2098 _green[thiscinfo->back],
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2099 _blue[thiscinfo->back]));
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2100 if(thiscinfo->hbrush)
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2101 DeleteObject(thiscinfo->hbrush);
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2102 thiscinfo->hbrush = CreateSolidBrush(RGB(_red[thiscinfo->back],
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2103 _green[thiscinfo->back],
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2104 _blue[thiscinfo->back]));
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2105 SelectObject(hdcPaint, thiscinfo->hbrush);
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2106 Rectangle(hdcPaint, ps.rcPaint.left - 1, ps.rcPaint.top - 1, ps.rcPaint.right + 1, ps.rcPaint.bottom + 1);
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2107 success = TRUE;
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2108 }
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2109 }
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2110 else if((thiscinfo->back & DW_RGB_COLOR) == DW_RGB_COLOR)
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2111 {
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2112 SetBkColor((HDC)mp1, RGB(DW_RED_VALUE(thiscinfo->back),
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2113 DW_GREEN_VALUE(thiscinfo->back),
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2114 DW_BLUE_VALUE(thiscinfo->back)));
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2115 if(thiscinfo->hbrush)
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2116 DeleteObject(thiscinfo->hbrush);
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2117 thiscinfo->hbrush = CreateSolidBrush(RGB(DW_RED_VALUE(thiscinfo->back),
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2118 DW_GREEN_VALUE(thiscinfo->back),
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2119 DW_BLUE_VALUE(thiscinfo->back)));
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2120 SelectObject(hdcPaint, thiscinfo->hbrush);
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2121 Rectangle(hdcPaint, ps.rcPaint.left - 1, ps.rcPaint.top - 1, ps.rcPaint.right + 1, ps.rcPaint.bottom + 1);
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2122 success = TRUE;
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2123 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2124 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2125
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2126 EndPaint(hWnd, &ps);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2127 if(success)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2128 return FALSE;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2129 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2130
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2131 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2132 break;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2133 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2134 return DefWindowProc(hWnd, msg, mp1, mp2);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2135 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2136
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2137 BOOL CALLBACK _rendwndproc(HWND hWnd, UINT msg, WPARAM mp1, LPARAM mp2)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2138 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2139 switch( msg )
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2140 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2141 case WM_LBUTTONDOWN:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2142 case WM_MBUTTONDOWN:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2143 case WM_RBUTTONDOWN:
267 bf8b907f8a29 Added initial version of updated key_press_event callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 257 diff changeset	2144 SetFocus(hWnd);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2145 _wndproc(hWnd, msg, mp1, mp2);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2146 break;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2147 case WM_LBUTTONUP:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2148 case WM_MBUTTONUP:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2149 case WM_RBUTTONUP:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2150 case WM_MOUSEMOVE:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2151 case WM_PAINT:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2152 case WM_SIZE:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2153 case WM_COMMAND:
267 bf8b907f8a29 Added initial version of updated key_press_event callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 257 diff changeset	2154 case WM_CHAR:
295 aac3ab26d636 More key_press cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 294 diff changeset	2155 case WM_KEYDOWN:
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2156 _wndproc(hWnd, msg, mp1, mp2);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2157 break;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2158 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2159 return DefWindowProc(hWnd, msg, mp1, mp2);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2160 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2161
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2162 BOOL CALLBACK _spinnerwndproc(HWND hWnd, UINT msg, WPARAM mp1, LPARAM mp2)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2163 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2164 ColorInfo *cinfo;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2165
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	2166 cinfo = (ColorInfo *)GetWindowLongPtr(hWnd, GWLP_USERDATA);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2167
527 e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	2168 if(msg == WM_MOUSEMOVE)
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	2169 _wndproc(hWnd, msg, mp1, mp2);
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	2170
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2171 if(cinfo)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2172 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2173 switch( msg )
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2174 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2175 case WM_LBUTTONDOWN:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2176 case WM_MBUTTONDOWN:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2177 case WM_RBUTTONDOWN:
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2178 case WM_KEYDOWN:
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2179 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2180 BOOL ret;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2181
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2182 if(!cinfo \|\| !cinfo->pOldProc)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2183 ret = DefWindowProc(hWnd, msg, mp1, mp2);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2184 ret = CallWindowProc(cinfo->pOldProc, hWnd, msg, mp1, mp2);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2185
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2186 /* Tell the edit control that a buttonpress has
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2187 * occured and to update it's window title.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2188 */
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2189 if(cinfo && cinfo->buddy)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2190 SendMessage(cinfo->buddy, WM_USER+10, 0, 0);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2191
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2192 SetTimer(hWnd, 100, 100, (TIMERPROC)NULL);
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2193
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2194 return ret;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2195 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2196 break;
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2197 case WM_LBUTTONUP:
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2198 case WM_MBUTTONUP:
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2199 case WM_RBUTTONUP:
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2200 case WM_KEYUP:
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2201 {
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2202 BOOL ret;
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2203
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2204 if(!cinfo \|\| !cinfo->pOldProc)
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2205 ret = DefWindowProc(hWnd, msg, mp1, mp2);
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2206 ret = CallWindowProc(cinfo->pOldProc, hWnd, msg, mp1, mp2);
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2207
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2208 /* Tell the edit control that a buttonpress has
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2209 * occured and to update it's window title.
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2210 */
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2211 if(cinfo && cinfo->buddy)
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2212 SendMessage(cinfo->buddy, WM_USER+10, 0, 0);
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2213
534 222b0f32e7c9 More Timer cleanups, but it still stops for no apparent reason! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 531 diff changeset	2214 if(hWnd)
222b0f32e7c9 More Timer cleanups, but it still stops for no apparent reason! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 531 diff changeset	2215 KillTimer(hWnd, 100);
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2216
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2217 return ret;
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2218 }
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2219 break;
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2220 case WM_TIMER:
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2221 {
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2222 if(mp1 == 100)
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2223 {
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2224 BOOL ret;
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2225
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2226 if(cinfo && cinfo->buddy)
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2227 SendMessage(cinfo->buddy, WM_USER+10, 0, 0);
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2228
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2229 if(!cinfo \|\| !cinfo->pOldProc)
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2230 ret = DefWindowProc(hWnd, msg, mp1, mp2);
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2231 ret = CallWindowProc(cinfo->pOldProc, hWnd, msg, mp1, mp2);
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2232
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2233 /* Tell the edit control that a buttonpress has
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2234 * occured and to update it's window title.
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2235 */
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2236 if(cinfo && cinfo->buddy)
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2237 SendMessage(cinfo->buddy, WM_USER+10, 0, 0);
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2238
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2239 return ret;
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2240 }
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2241 }
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2242 break;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2243 case WM_USER+10:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2244 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2245 if(cinfo->buddy)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2246 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2247 char tempbuf[100] = "";
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2248 long position;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2249
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2250 GetWindowText(cinfo->buddy, tempbuf, 99);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2251
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2252 position = atol(tempbuf);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2253
75 c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	2254 if(IS_IE5PLUS)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2255 SendMessage(hWnd, UDM_SETPOS32, 0, (LPARAM)position);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2256 else
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2257 SendMessage(hWnd, UDM_SETPOS, 0, (LPARAM)MAKELONG((short)position, 0));
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2258 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2259 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2260 break;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2261 }
57 1ed95c8ec2ff Added a mutex lock and unlock in the pointer calls. And fixed a warning bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 55 diff changeset	2262 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2263
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2264 if(!cinfo \|\| !cinfo->pOldProc)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2265 return DefWindowProc(hWnd, msg, mp1, mp2);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2266 return CallWindowProc(cinfo->pOldProc, hWnd, msg, mp1, mp2);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2267 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2268
40 88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2269 void _click_default(HWND handle)
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2270 {
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2271 char tmpbuf[100];
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2272
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2273 GetClassName(handle, tmpbuf, 99);
40 88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2274
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2275 /* These are the window classes which can
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2276 * obtain input focus.
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2277 */
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2278 if(strnicmp(tmpbuf, BUTTONCLASSNAME, strlen(BUTTONCLASSNAME))==0)
40 88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2279 {
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2280 /* Generate click on default item */
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2281 SignalHandler *tmp = Root;
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2282
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2283 /* Find any callbacks for this function */
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2284 while(tmp)
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2285 {
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2286 if(tmp->message == WM_COMMAND)
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2287 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2288 int (clickfunc)(HWND, void ) = tmp->signalfunction;
40 88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2289
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2290 /* Make sure it's the right window, and the right ID */
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2291 if(tmp->window == handle)
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2292 {
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2293 clickfunc(tmp->window, tmp->data);
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2294 tmp = NULL;
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2295 }
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2296 }
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2297 if(tmp)
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2298 tmp= tmp->next;
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2299 }
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2300 }
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2301 else
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2302 SetFocus(handle);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2303 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2304
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2305 BOOL CALLBACK _colorwndproc(HWND hWnd, UINT msg, WPARAM mp1, LPARAM mp2)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2306 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2307 ColorInfo *cinfo;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2308 char tmpbuf[100];
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2309 WNDPROC pOldProc = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2310
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	2311 cinfo = (ColorInfo *)GetWindowLongPtr(hWnd, GWLP_USERDATA);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2312
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2313 GetClassName(hWnd, tmpbuf, 99);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2314 if(strcmp(tmpbuf, FRAMECLASSNAME) == 0)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2315 cinfo = &(((Box *)cinfo)->cinfo);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2316
527 e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	2317 if(msg == WM_MOUSEMOVE)
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	2318 _wndproc(hWnd, msg, mp1, mp2);
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	2319
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2320 if(cinfo)
57 1ed95c8ec2ff Added a mutex lock and unlock in the pointer calls. And fixed a warning bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 55 diff changeset	2321 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2322 pOldProc = cinfo->pOldProc;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2323
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2324 switch( msg )
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2325 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2326 case WM_SETFOCUS:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2327 if(cinfo->combo)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2328 _wndproc(cinfo->combo, msg, mp1, mp2);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2329 else
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2330 _wndproc(hWnd, msg, mp1, mp2);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2331 break;
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	2332 case WM_VSCROLL:
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	2333 case WM_HSCROLL:
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	2334 _wndproc(hWnd, msg, mp1, mp2);
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	2335 break;
110 d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2336 case WM_KEYDOWN:
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2337 case WM_KEYUP:
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2338 {
534 222b0f32e7c9 More Timer cleanups, but it still stops for no apparent reason! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 531 diff changeset	2339 if(hWnd && (mp1 == VK_UP \|\| mp1 == VK_DOWN))
110 d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2340 {
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2341 BOOL ret;
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2342
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2343 if(!cinfo \|\| !cinfo->pOldProc)
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2344 ret = DefWindowProc(hWnd, msg, mp1, mp2);
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2345 ret = CallWindowProc(cinfo->pOldProc, hWnd, msg, mp1, mp2);
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2346
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2347 /* Tell the spinner control that a keypress has
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2348 * occured and to update it's internal value.
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2349 */
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2350 if(cinfo && cinfo->buddy && !cinfo->combo)
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2351 PostMessage(hWnd, WM_USER+10, 0, 0);
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2352
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2353 if(msg == WM_KEYDOWN)
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2354 SetTimer(hWnd, 101, 100, (TIMERPROC)NULL);
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2355 else
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2356 KillTimer(hWnd, 101);
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2357
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2358 return ret;
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2359 }
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2360 }
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2361 break;
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2362 case WM_TIMER:
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2363 {
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2364 if(mp1 == 101)
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2365 {
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2366 BOOL ret;
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2367
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2368 if(!cinfo \|\| !cinfo->pOldProc)
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2369 ret = DefWindowProc(hWnd, msg, mp1, mp2);
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2370 ret = CallWindowProc(cinfo->pOldProc, hWnd, msg, mp1, mp2);
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2371
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2372 /* Tell the spinner control that a keypress has
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2373 * occured and to update it's internal value.
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2374 */
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2375 if(cinfo && cinfo->buddy && !cinfo->combo)
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2376 PostMessage(hWnd, WM_USER+10, 0, 0);
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2377
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2378 return ret;
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2379 }
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2380 }
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2381 break;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2382 case WM_CHAR:
277 d706e0dbb0cb Pass WM_CHAR messages to the signal handler proc for boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 267 diff changeset	2383 _wndproc(hWnd, msg, mp1, mp2);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2384 if(LOWORD(mp1) == '\t')
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2385 {
82 aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	2386 if(GetAsyncKeyState(VK_SHIFT) & 0x8000)
61 4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	2387 {
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	2388 if(cinfo->combo)
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	2389 _shift_focus_back(cinfo->combo);
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	2390 else if(cinfo->buddy)
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	2391 _shift_focus_back(cinfo->buddy);
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	2392 else
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	2393 _shift_focus_back(hWnd);
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	2394 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2395 else
61 4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	2396 {
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	2397 if(cinfo->combo)
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	2398 _shift_focus(cinfo->combo);
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	2399 else if(cinfo->buddy)
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	2400 _shift_focus(cinfo->buddy);
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	2401 else
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	2402 _shift_focus(hWnd);
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	2403 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2404 return FALSE;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2405 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2406 else if(LOWORD(mp1) == '\r')
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2407 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2408 if(cinfo->clickdefault)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2409 _click_default(cinfo->clickdefault);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2410
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2411 }
111 1e406d67b178 Readded a piece of code I accidentally removed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 110 diff changeset	2412
1e406d67b178 Readded a piece of code I accidentally removed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 110 diff changeset	2413 /* Tell the spinner control that a keypress has
1e406d67b178 Readded a piece of code I accidentally removed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 110 diff changeset	2414 * occured and to update it's internal value.
1e406d67b178 Readded a piece of code I accidentally removed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 110 diff changeset	2415 */
1e406d67b178 Readded a piece of code I accidentally removed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 110 diff changeset	2416 if(cinfo->buddy && !cinfo->combo)
1e406d67b178 Readded a piece of code I accidentally removed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 110 diff changeset	2417 {
1e406d67b178 Readded a piece of code I accidentally removed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 110 diff changeset	2418 if(IsWinNT())
1e406d67b178 Readded a piece of code I accidentally removed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 110 diff changeset	2419 PostMessage(cinfo->buddy, WM_USER+10, 0, 0);
1e406d67b178 Readded a piece of code I accidentally removed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 110 diff changeset	2420 else
1e406d67b178 Readded a piece of code I accidentally removed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 110 diff changeset	2421 SendMessage(cinfo->buddy, WM_USER+10, 0, 0);
1e406d67b178 Readded a piece of code I accidentally removed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 110 diff changeset	2422 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2423 break;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2424 case WM_USER+10:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2425 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2426 if(cinfo->buddy)
57 1ed95c8ec2ff Added a mutex lock and unlock in the pointer calls. And fixed a warning bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 55 diff changeset	2427 {
79 8082cb0e7c2e Updated to the latest DW. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 75 diff changeset	2428 long val;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2429
75 c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	2430 if(IS_IE5PLUS)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2431 val = (long)SendMessage(cinfo->buddy, UDM_GETPOS32, 0, 0);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2432 else
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2433 val = (long)SendMessage(cinfo->buddy, UDM_GETPOS, 0, 0);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2434
79 8082cb0e7c2e Updated to the latest DW. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 75 diff changeset	2435 sprintf(tmpbuf, "%d", val);
8082cb0e7c2e Updated to the latest DW. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 75 diff changeset	2436 SetWindowText(hWnd, tmpbuf);
57 1ed95c8ec2ff Added a mutex lock and unlock in the pointer calls. And fixed a warning bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 55 diff changeset	2437 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2438 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2439 break;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2440 case WM_CTLCOLORSTATIC:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2441 case WM_CTLCOLORLISTBOX:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2442 case WM_CTLCOLORBTN:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2443 case WM_CTLCOLOREDIT:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2444 case WM_CTLCOLORMSGBOX:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2445 case WM_CTLCOLORSCROLLBAR:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2446 case WM_CTLCOLORDLG:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2447 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	2448 ColorInfo thiscinfo = (ColorInfo )GetWindowLongPtr((HWND)mp2, GWLP_USERDATA);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2449 if(thiscinfo && thiscinfo->fore != -1 && thiscinfo->back != -1)
57 1ed95c8ec2ff Added a mutex lock and unlock in the pointer calls. And fixed a warning bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 55 diff changeset	2450 {
155 840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2451 /* Handle foreground */
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2452 if(thiscinfo->fore > -1 && thiscinfo->fore < 18)
57 1ed95c8ec2ff Added a mutex lock and unlock in the pointer calls. And fixed a warning bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 55 diff changeset	2453 {
155 840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2454 if(thiscinfo->fore != DW_CLR_DEFAULT)
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2455 {
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2456 SetTextColor((HDC)mp1, RGB(_red[thiscinfo->fore],
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2457 _green[thiscinfo->fore],
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2458 _blue[thiscinfo->fore]));
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2459 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2460 }
155 840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2461 else if((thiscinfo->fore & DW_RGB_COLOR) == DW_RGB_COLOR)
57 1ed95c8ec2ff Added a mutex lock and unlock in the pointer calls. And fixed a warning bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 55 diff changeset	2462 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2463 SetTextColor((HDC)mp1, RGB(DW_RED_VALUE(thiscinfo->fore),
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2464 DW_GREEN_VALUE(thiscinfo->fore),
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2465 DW_BLUE_VALUE(thiscinfo->fore)));
155 840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2466 }
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2467 /* Handle background */
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2468 if(thiscinfo->back > -1 && thiscinfo->back < 18)
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2469 {
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2470 if(thiscinfo->back == DW_CLR_DEFAULT)
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2471 {
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2472 HBRUSH hbr = GetSysColorBrush(COLOR_3DFACE);
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2473
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2474 SetBkColor((HDC)mp1, GetSysColor(COLOR_3DFACE));
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2475
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2476
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2477 SelectObject((HDC)mp1, hbr);
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2478 return (LONG)hbr;
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2479 }
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2480 else
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2481 {
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2482 SetBkColor((HDC)mp1, RGB(_red[thiscinfo->back],
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2483 _green[thiscinfo->back],
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2484 _blue[thiscinfo->back]));
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2485 if(thiscinfo->hbrush)
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2486 DeleteObject(thiscinfo->hbrush);
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2487 thiscinfo->hbrush = CreateSolidBrush(RGB(_red[thiscinfo->back],
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2488 _green[thiscinfo->back],
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2489 _blue[thiscinfo->back]));
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2490 SelectObject((HDC)mp1, thiscinfo->hbrush);
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2491 }
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2492 return (LONG)thiscinfo->hbrush;
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2493 }
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2494 else if((thiscinfo->back & DW_RGB_COLOR) == DW_RGB_COLOR)
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2495 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2496 SetBkColor((HDC)mp1, RGB(DW_RED_VALUE(thiscinfo->back),
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2497 DW_GREEN_VALUE(thiscinfo->back),
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2498 DW_BLUE_VALUE(thiscinfo->back)));
82 aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	2499 if(thiscinfo->hbrush)
aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	2500 DeleteObject(thiscinfo->hbrush);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2501 thiscinfo->hbrush = CreateSolidBrush(RGB(DW_RED_VALUE(thiscinfo->back),
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2502 DW_GREEN_VALUE(thiscinfo->back),
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2503 DW_BLUE_VALUE(thiscinfo->back)));
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2504 SelectObject((HDC)mp1, thiscinfo->hbrush);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2505 return (LONG)thiscinfo->hbrush;
57 1ed95c8ec2ff Added a mutex lock and unlock in the pointer calls. And fixed a warning bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 55 diff changeset	2506 }
1ed95c8ec2ff Added a mutex lock and unlock in the pointer calls. And fixed a warning bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 55 diff changeset	2507 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2508
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2509 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2510 break;
57 1ed95c8ec2ff Added a mutex lock and unlock in the pointer calls. And fixed a warning bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 55 diff changeset	2511 }
1ed95c8ec2ff Added a mutex lock and unlock in the pointer calls. And fixed a warning bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 55 diff changeset	2512 }
1ed95c8ec2ff Added a mutex lock and unlock in the pointer calls. And fixed a warning bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 55 diff changeset	2513
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2514 if(!pOldProc)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2515 return DefWindowProc(hWnd, msg, mp1, mp2);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2516 return CallWindowProc(pOldProc, hWnd, msg, mp1, mp2);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2517 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2518
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2519 BOOL CALLBACK _containerwndproc(HWND hWnd, UINT msg, WPARAM mp1, LPARAM mp2)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2520 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2521 ContainerInfo *cinfo;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2522
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	2523 cinfo = (ContainerInfo *)GetWindowLongPtr(hWnd, GWLP_USERDATA);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2524
57 1ed95c8ec2ff Added a mutex lock and unlock in the pointer calls. And fixed a warning bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 55 diff changeset	2525 switch( msg )
1ed95c8ec2ff Added a mutex lock and unlock in the pointer calls. And fixed a warning bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 55 diff changeset	2526 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2527 case WM_COMMAND:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2528 case WM_NOTIFY:
527 e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	2529 case WM_MOUSEMOVE:
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2530 _wndproc(hWnd, msg, mp1, mp2);
57 1ed95c8ec2ff Added a mutex lock and unlock in the pointer calls. And fixed a warning bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 55 diff changeset	2531 break;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2532 case WM_LBUTTONDBLCLK:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2533 case WM_CHAR:
57 1ed95c8ec2ff Added a mutex lock and unlock in the pointer calls. And fixed a warning bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 55 diff changeset	2534 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2535 LV_ITEM lvi;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2536 int iItem;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2537
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2538 if(LOWORD(mp1) == '\t')
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2539 {
82 aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	2540 if(GetAsyncKeyState(VK_SHIFT) & 0x8000)
61 4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	2541 _shift_focus_back(hWnd);
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	2542 else
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	2543 _shift_focus(hWnd);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2544 return FALSE;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2545 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2546
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2547 if(msg == WM_CHAR && (char)mp1 != '\r')
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2548 break;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2549
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2550 iItem = ListView_GetNextItem(hWnd, -1, LVNI_FOCUSED);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2551
69 9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	2552 memset(&lvi, 0, sizeof(LV_ITEM));
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	2553
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2554 if(iItem > -1)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2555 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2556 lvi.iItem = iItem;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2557 lvi.mask = LVIF_PARAM;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2558
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2559 ListView_GetItem(hWnd, &lvi);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2560 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2561
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2562 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2563 SignalHandler *tmp = Root;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2564
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2565 while(tmp)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2566 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2567 if(tmp->message == NM_DBLCLK && tmp->window == hWnd)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2568 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2569 int (containerselectfunc)(HWND, char , void *) = tmp->signalfunction;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2570
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2571 /* Seems to be having lParam as 1 which really sucks */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2572 if(lvi.lParam < 100)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2573 lvi.lParam = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2574
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2575 containerselectfunc(tmp->window, (char *)lvi.lParam, tmp->data);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2576 tmp = NULL;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2577 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2578 if(tmp)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2579 tmp = tmp->next;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2580 }
57 1ed95c8ec2ff Added a mutex lock and unlock in the pointer calls. And fixed a warning bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 55 diff changeset	2581 }
1ed95c8ec2ff Added a mutex lock and unlock in the pointer calls. And fixed a warning bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 55 diff changeset	2582 }
1ed95c8ec2ff Added a mutex lock and unlock in the pointer calls. And fixed a warning bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 55 diff changeset	2583 break;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2584 case WM_CONTEXTMENU:
57 1ed95c8ec2ff Added a mutex lock and unlock in the pointer calls. And fixed a warning bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 55 diff changeset	2585 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2586 SignalHandler *tmp = Root;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2587
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2588 while(tmp)
57 1ed95c8ec2ff Added a mutex lock and unlock in the pointer calls. And fixed a warning bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 55 diff changeset	2589 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2590 if(tmp->message == NM_RCLICK && tmp->window == hWnd)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2591 {
312 ff8f23594b15 Make sure itemdata is NULL for container callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 311 diff changeset	2592 int (containercontextfunc)(HWND, char , int, int, void , void ) = tmp->signalfunction;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2593 LONG x,y;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2594 LV_ITEM lvi;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2595 int iItem;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2596 LVHITTESTINFO lhi;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2597
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2598 dw_pointer_query_pos(&x, &y);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2599
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2600 lhi.pt.x = x;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2601 lhi.pt.y = y;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2602
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2603 MapWindowPoints(HWND_DESKTOP, tmp->window, &lhi.pt, 1);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2604
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2605 iItem = ListView_HitTest(tmp->window, &lhi);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2606
69 9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	2607 memset(&lvi, 0, sizeof(LV_ITEM));
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	2608
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2609 if(iItem > -1)
57 1ed95c8ec2ff Added a mutex lock and unlock in the pointer calls. And fixed a warning bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 55 diff changeset	2610 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2611 lvi.iItem = iItem;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2612 lvi.mask = LVIF_PARAM;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2613
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2614 ListView_GetItem(tmp->window, &lvi);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2615 ListView_SetSelectionMark(tmp->window, iItem);
57 1ed95c8ec2ff Added a mutex lock and unlock in the pointer calls. And fixed a warning bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 55 diff changeset	2616 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2617
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2618 /* Seems to be having lParam as 1 which really sucks */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2619 if(lvi.lParam < 100)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2620 lvi.lParam = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2621
312 ff8f23594b15 Make sure itemdata is NULL for container callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 311 diff changeset	2622 containercontextfunc(tmp->window, (char *)lvi.lParam, x, y, tmp->data, NULL);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2623 tmp = NULL;
57 1ed95c8ec2ff Added a mutex lock and unlock in the pointer calls. And fixed a warning bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 55 diff changeset	2624 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2625 if(tmp)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2626 tmp = tmp->next;
57 1ed95c8ec2ff Added a mutex lock and unlock in the pointer calls. And fixed a warning bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 55 diff changeset	2627 }
1ed95c8ec2ff Added a mutex lock and unlock in the pointer calls. And fixed a warning bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 55 diff changeset	2628 }
1ed95c8ec2ff Added a mutex lock and unlock in the pointer calls. And fixed a warning bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 55 diff changeset	2629 break;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2630 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2631
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2632 if(!cinfo \|\| !cinfo->pOldProc)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2633 return DefWindowProc(hWnd, msg, mp1, mp2);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2634 return CallWindowProc(cinfo->pOldProc, hWnd, msg, mp1, mp2);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2635 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2636
68 8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2637 BOOL CALLBACK _treewndproc(HWND hWnd, UINT msg, WPARAM mp1, LPARAM mp2)
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2638 {
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2639 ContainerInfo *cinfo;
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2640
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	2641 cinfo = (ContainerInfo *)GetWindowLongPtr(hWnd, GWLP_USERDATA);
68 8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2642
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2643 switch( msg )
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2644 {
527 e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	2645 case WM_MOUSEMOVE:
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	2646 _wndproc(hWnd, msg, mp1, mp2);
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	2647 break;
68 8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2648 case WM_CHAR:
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2649 if(LOWORD(mp1) == '\t')
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2650 {
82 aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	2651 if(GetAsyncKeyState(VK_SHIFT) & 0x8000)
68 8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2652 _shift_focus_back(hWnd);
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2653 else
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2654 _shift_focus(hWnd);
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2655 return FALSE;
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2656 }
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2657 break;
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2658 }
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2659
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2660 if(!cinfo \|\| !cinfo->pOldProc)
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2661 return DefWindowProc(hWnd, msg, mp1, mp2);
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2662 return CallWindowProc(cinfo->pOldProc, hWnd, msg, mp1, mp2);
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2663 }
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2664
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2665 void _changebox(Box *thisbox, int percent, int type)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2666 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2667 int z;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2668
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2669 for(z=0;z<thisbox->count;z++)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2670 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2671 if(thisbox->items[z].type == TYPEBOX)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2672 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	2673 Box tmp = (Box)GetWindowLongPtr(thisbox->items[z].hwnd, GWLP_USERDATA);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2674 _changebox(tmp, percent, type);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2675 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2676 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2677 {
283 54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	2678 if(type == DW_HORZ)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2679 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2680 if(thisbox->items[z].hsize == SIZEEXPAND)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2681 thisbox->items[z].width = (int)(((float)thisbox->items[z].origwidth) * (((float)percent)/((float)100.0)));
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2682 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2683 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2684 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2685 if(thisbox->items[z].vsize == SIZEEXPAND)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2686 thisbox->items[z].height = (int)(((float)thisbox->items[z].origheight) * (((float)percent)/((float)100.0)));
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2687 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2688 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2689 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2690 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2691
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2692 void _handle_splitbar_resize(HWND hwnd, float percent, int type, int x, int y)
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2693 {
283 54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	2694 if(type == DW_HORZ)
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2695 {
182 b8caec82a4d2 Minor splitbar fixes on OS/2 and Windows. The splitbar width is now 4 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 181 diff changeset	2696 int newx = x;
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2697 float ratio = (float)percent/(float)100.0;
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2698 HWND handle1 = (HWND)dw_window_get_data(hwnd, "_dw_topleft");
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2699 HWND handle2 = (HWND)dw_window_get_data(hwnd, "_dw_bottomright");
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	2700 Box tmp = (Box )GetWindowLongPtr(handle1, GWLP_USERDATA);
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2701
182 b8caec82a4d2 Minor splitbar fixes on OS/2 and Windows. The splitbar width is now 4 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 181 diff changeset	2702 newx = (int)((float)newx * ratio) - (SPLITBAR_WIDTH/2);
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2703
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2704 ShowWindow(handle1, SW_HIDE);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2705 ShowWindow(handle2, SW_HIDE);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2706
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2707 MoveWindow(handle1, 0, 0, newx, y, FALSE);
182 b8caec82a4d2 Minor splitbar fixes on OS/2 and Windows. The splitbar width is now 4 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 181 diff changeset	2708 _do_resize(tmp, newx - 1, y - 1);
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2709
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	2710 tmp = (Box *)GetWindowLongPtr(handle2, GWLP_USERDATA);
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2711
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2712 newx = x - newx - SPLITBAR_WIDTH;
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2713
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2714 MoveWindow(handle2, x - newx, 0, newx, y, FALSE);
182 b8caec82a4d2 Minor splitbar fixes on OS/2 and Windows. The splitbar width is now 4 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 181 diff changeset	2715 _do_resize(tmp, newx - 1, y - 1);
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2716
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2717 ShowWindow(handle1, SW_SHOW);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2718 ShowWindow(handle2, SW_SHOW);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2719
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2720 dw_window_set_data(hwnd, "_dw_start", (void *)newx);
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2721 }
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2722 else
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2723 {
182 b8caec82a4d2 Minor splitbar fixes on OS/2 and Windows. The splitbar width is now 4 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 181 diff changeset	2724 int newy = y;
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2725 float ratio = (float)(100.0-percent)/(float)100.0;
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2726 HWND handle1 = (HWND)dw_window_get_data(hwnd, "_dw_bottomright");
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2727 HWND handle2 = (HWND)dw_window_get_data(hwnd, "_dw_topleft");
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	2728 Box tmp = (Box )GetWindowLongPtr(handle1, GWLP_USERDATA);
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2729
182 b8caec82a4d2 Minor splitbar fixes on OS/2 and Windows. The splitbar width is now 4 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 181 diff changeset	2730 newy = (int)((float)newy * ratio) - (SPLITBAR_WIDTH/2);
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2731
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2732 ShowWindow(handle1, SW_HIDE);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2733 ShowWindow(handle2, SW_HIDE);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2734
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2735 MoveWindow(handle1, 0, y - newy, x, newy, FALSE);
182 b8caec82a4d2 Minor splitbar fixes on OS/2 and Windows. The splitbar width is now 4 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 181 diff changeset	2736 _do_resize(tmp, x - 1, newy - 1);
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2737
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	2738 tmp = (Box *)GetWindowLongPtr(handle2, GWLP_USERDATA);
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2739
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2740 newy = y - newy - SPLITBAR_WIDTH;
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2741
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2742 MoveWindow(handle2, 0, 0, x, newy, FALSE);
182 b8caec82a4d2 Minor splitbar fixes on OS/2 and Windows. The splitbar width is now 4 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 181 diff changeset	2743 _do_resize(tmp, x - 1, newy - 1);
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2744
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2745 ShowWindow(handle1, SW_SHOW);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2746 ShowWindow(handle2, SW_SHOW);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2747
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2748 dw_window_set_data(hwnd, "_dw_start", (void *)newy);
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2749 }
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2750 }
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2751
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2752 /* This handles any activity on the splitbars (sizers) */
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2753 BOOL CALLBACK _splitwndproc(HWND hwnd, UINT msg, WPARAM mp1, LPARAM mp2)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2754 {
124 edf615d8266e Use float instead of int for percent on Windows. And a minor safety check bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 119 diff changeset	2755 float percent = (float )dw_window_get_data(hwnd, "_dw_percent");
118 c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	2756 int type = (int)dw_window_get_data(hwnd, "_dw_type");
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2757 int start = (int)dw_window_get_data(hwnd, "_dw_start");
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2758
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2759 switch (msg)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2760 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2761 case WM_ACTIVATE:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2762 case WM_SETFOCUS:
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2763 return FALSE;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2764
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2765 case WM_PAINT:
118 c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	2766 {
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2767 PAINTSTRUCT ps;
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2768 HDC hdcPaint;
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2769
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2770 BeginPaint(hwnd, &ps);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2771
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2772 if((hdcPaint = GetDC(hwnd)) != NULL)
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2773 {
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2774 int cx, cy;
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2775 HBRUSH oldBrush = SelectObject(hdcPaint, GetSysColorBrush(COLOR_3DFACE));
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2776 HPEN oldPen = SelectObject(hdcPaint, CreatePen(PS_SOLID, 1, GetSysColor(COLOR_3DFACE)));
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2777
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2778 dw_window_get_pos_size(hwnd, NULL, NULL, &cx, &cy);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2779
283 54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	2780 if(type == DW_HORZ)
182 b8caec82a4d2 Minor splitbar fixes on OS/2 and Windows. The splitbar width is now 4 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 181 diff changeset	2781 Rectangle(hdcPaint, cx - start - SPLITBAR_WIDTH, 0, cx - start, cy);
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2782 else
182 b8caec82a4d2 Minor splitbar fixes on OS/2 and Windows. The splitbar width is now 4 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 181 diff changeset	2783 Rectangle(hdcPaint, 0, start, cx, start + SPLITBAR_WIDTH);
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2784
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2785 SelectObject(hdcPaint, oldBrush);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2786 DeleteObject(SelectObject(hdcPaint, oldPen));
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2787 ReleaseDC(hwnd, hdcPaint);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2788 }
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2789 EndPaint(hwnd, &ps);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2790 }
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2791 break;
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2792 case WM_LBUTTONDOWN:
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2793 {
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2794 SetCapture(hwnd);
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2795 break;
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2796 }
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2797 case WM_LBUTTONUP:
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2798 {
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2799 if(GetCapture() == hwnd)
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2800 ReleaseCapture();
118 c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	2801 }
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	2802 break;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2803 case WM_MOUSEMOVE:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2804 {
283 54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	2805 if(type == DW_HORZ)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2806 SetCursor(LoadCursor(NULL, IDC_SIZEWE));
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2807 else
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2808 SetCursor(LoadCursor(NULL, IDC_SIZENS));
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2809
127 c5c3ccb84ac7 Safety checks in the splitbar calculations on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 126 diff changeset	2810 if(GetCapture() == hwnd && percent)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2811 {
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2812 POINT point;
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2813 RECT rect;
157 a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2814 static POINT lastpoint;
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2815
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2816 GetCursorPos(&point);
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2817 GetWindowRect(hwnd, &rect);
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2818
157 a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2819 if(memcmp(&point, &lastpoint, sizeof(POINT)))
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2820 {
157 a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2821 if(PtInRect(&rect, point))
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2822 {
157 a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2823 int width = (rect.right - rect.left);
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2824 int height = (rect.bottom - rect.top);
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2825
283 54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	2826 if(type == DW_HORZ)
157 a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2827 {
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2828 start = point.x - rect.left;
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2829 if(width - SPLITBAR_WIDTH > 1 && start < width - SPLITBAR_WIDTH)
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2830 percent = ((float)start / (float)(width - SPLITBAR_WIDTH)) 100.0;
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2831 }
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2832 else
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2833 {
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2834 start = point.y - rect.top;
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2835 if(height - SPLITBAR_WIDTH > 1 && start < height - SPLITBAR_WIDTH)
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2836 percent = ((float)start / (float)(height - SPLITBAR_WIDTH)) 100.0;
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2837 }
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2838 _handle_splitbar_resize(hwnd, *percent, type, width, height);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2839 }
157 a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2840 memcpy(&lastpoint, &point, sizeof(POINT));
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2841 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2842 }
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2843 break;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2844 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2845 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2846 return DefWindowProc(hwnd, msg, mp1, mp2);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2847 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2848
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2849 /* This handles drawing the status text areas */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2850 BOOL CALLBACK _statuswndproc(HWND hwnd, UINT msg, WPARAM mp1, LPARAM mp2)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2851 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2852 switch (msg)
7 005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	2853 {
527 e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	2854 case WM_MOUSEMOVE:
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	2855 _wndproc(hwnd, msg, mp1, mp2);
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	2856 break;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2857 case WM_SETTEXT:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2858 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2859 /* Make sure the control redraws when there is a text change */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2860 int ret = (int)DefWindowProc(hwnd, msg, mp1, mp2);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2861
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2862 InvalidateRgn(hwnd, NULL, TRUE);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2863 return ret;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2864 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2865 case WM_PAINT:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2866 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2867 HDC hdcPaint;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2868 PAINTSTRUCT ps;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2869 RECT rc;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2870 unsigned long cx, cy;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2871 int threadid = dw_thread_id();
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2872 char tempbuf[1024] = "";
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	2873 ColorInfo cinfo = (ColorInfo )GetWindowLongPtr(hwnd, GWLP_USERDATA);
299 2a97f8d9b297 Use DrawStatusText() to make the status lines, instead of doing it ourself. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 298 diff changeset	2874 HFONT hfont = _acquire_font(hwnd, cinfo ? cinfo->fontname : NULL);
2a97f8d9b297 Use DrawStatusText() to make the status lines, instead of doing it ourself. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 298 diff changeset	2875 HFONT oldfont = (HFONT)SendMessage(hwnd, WM_GETFONT, 0, 0);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2876
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2877 dw_window_get_pos_size(hwnd, NULL, NULL, &cx, &cy);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2878 GetWindowText(hwnd, tempbuf, 1024);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2879
299 2a97f8d9b297 Use DrawStatusText() to make the status lines, instead of doing it ourself. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 298 diff changeset	2880 hdcPaint = BeginPaint(hwnd, &ps);
2a97f8d9b297 Use DrawStatusText() to make the status lines, instead of doing it ourself. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 298 diff changeset	2881 if(hfont)
2a97f8d9b297 Use DrawStatusText() to make the status lines, instead of doing it ourself. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 298 diff changeset	2882 oldfont = (HFONT)SelectObject(hdcPaint, hfont);
2a97f8d9b297 Use DrawStatusText() to make the status lines, instead of doing it ourself. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 298 diff changeset	2883 rc.top = rc.left = 0;
2a97f8d9b297 Use DrawStatusText() to make the status lines, instead of doing it ourself. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 298 diff changeset	2884 rc.right = cx;
2a97f8d9b297 Use DrawStatusText() to make the status lines, instead of doing it ourself. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 298 diff changeset	2885 rc.bottom = cy;
2a97f8d9b297 Use DrawStatusText() to make the status lines, instead of doing it ourself. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 298 diff changeset	2886 DrawStatusText(hdcPaint, &rc, tempbuf, 0);
2a97f8d9b297 Use DrawStatusText() to make the status lines, instead of doing it ourself. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 298 diff changeset	2887 if(hfont && oldfont)
2a97f8d9b297 Use DrawStatusText() to make the status lines, instead of doing it ourself. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 298 diff changeset	2888 SelectObject(hdcPaint, oldfont);
2a97f8d9b297 Use DrawStatusText() to make the status lines, instead of doing it ourself. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 298 diff changeset	2889 if(hfont)
2a97f8d9b297 Use DrawStatusText() to make the status lines, instead of doing it ourself. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 298 diff changeset	2890 DeleteObject(hfont);
2a97f8d9b297 Use DrawStatusText() to make the status lines, instead of doing it ourself. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 298 diff changeset	2891 EndPaint(hwnd, &ps);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2892 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2893 return FALSE;
7 005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	2894 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2895 return DefWindowProc(hwnd, msg, mp1, mp2);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2896 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2897
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2898 /* Function: _BtProc
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2899 * Abstract: Subclass procedure for buttons
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2900 */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2901
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2902 BOOL CALLBACK _BtProc(HWND hwnd, ULONG msg, WPARAM mp1, LPARAM mp2)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2903 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2904 BubbleButton *bubble;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2905 static int bMouseOver = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2906 POINT point;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2907 RECT rect;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2908 WNDPROC pOldProc;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2909
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	2910 bubble = (BubbleButton *)GetWindowLongPtr(hwnd, GWLP_USERDATA);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2911
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2912 if(!bubble)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2913 return DefWindowProc(hwnd, msg, mp1, mp2);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2914
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2915 /* We must save a pointer to the old
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2916 * window procedure because if a signal
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2917 * handler attached here destroys this
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2918 * window it will then be invalid.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2919 */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2920 pOldProc = bubble->pOldProc;
54 c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	2921
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2922 switch(msg)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2923 {
341 503d1ac958bb Call TreeView_SelectItem() instead of dw_tree_item_select() so we get the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 339 diff changeset	2924 case WM_CTLCOLORSTATIC:
503d1ac958bb Call TreeView_SelectItem() instead of dw_tree_item_select() so we get the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 339 diff changeset	2925 case WM_CTLCOLORLISTBOX:
503d1ac958bb Call TreeView_SelectItem() instead of dw_tree_item_select() so we get the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 339 diff changeset	2926 case WM_CTLCOLORBTN:
503d1ac958bb Call TreeView_SelectItem() instead of dw_tree_item_select() so we get the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 339 diff changeset	2927 case WM_CTLCOLOREDIT:
503d1ac958bb Call TreeView_SelectItem() instead of dw_tree_item_select() so we get the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 339 diff changeset	2928 case WM_CTLCOLORMSGBOX:
503d1ac958bb Call TreeView_SelectItem() instead of dw_tree_item_select() so we get the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 339 diff changeset	2929 case WM_CTLCOLORSCROLLBAR:
503d1ac958bb Call TreeView_SelectItem() instead of dw_tree_item_select() so we get the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 339 diff changeset	2930 case WM_CTLCOLORDLG:
503d1ac958bb Call TreeView_SelectItem() instead of dw_tree_item_select() so we get the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 339 diff changeset	2931 _wndproc(hwnd, msg, mp1, mp2);
503d1ac958bb Call TreeView_SelectItem() instead of dw_tree_item_select() so we get the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 339 diff changeset	2932 break;
37 360bc6a5f1c9 Sync with latest Dynamic Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 34 diff changeset	2933 case WM_SETFOCUS:
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2934 _wndproc(hwnd, msg, mp1, mp2);
37 360bc6a5f1c9 Sync with latest Dynamic Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 34 diff changeset	2935 break;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2936 case WM_LBUTTONUP:
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2937 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2938 SignalHandler *tmp = Root;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2939
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2940 /* Find any callbacks for this function */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2941 while(tmp)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2942 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2943 if(tmp->message == WM_COMMAND)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2944 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2945 int (clickfunc)(HWND, void ) = tmp->signalfunction;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2946
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2947 /* Make sure it's the right window, and the right ID */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2948 if(tmp->window == hwnd)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2949 {
60 61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	2950 if(bubble->checkbox)
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	2951 in_checkbox_handler = 1;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	2952
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2953 clickfunc(tmp->window, tmp->data);
60 61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	2954
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	2955 if(bubble->checkbox)
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	2956 in_checkbox_handler = 0;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2957 tmp = NULL;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2958 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2959 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2960 if(tmp)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2961 tmp= tmp->next;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2962 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2963 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2964 break;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2965 case WM_CHAR:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2966 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2967 /* A button press should also occur for an ENTER or SPACE press
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2968 * while the button has the active input focus.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2969 */
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2970 if(LOWORD(mp1) == '\r' \|\| LOWORD(mp1) == ' ')
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2971 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2972 SignalHandler *tmp = Root;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2973
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2974 /* Find any callbacks for this function */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2975 while(tmp)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2976 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2977 if(tmp->message == WM_COMMAND)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2978 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2979 int (clickfunc)(HWND, void ) = tmp->signalfunction;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2980
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2981 /* Make sure it's the right window, and the right ID */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2982 if(tmp->window == hwnd)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2983 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2984 clickfunc(tmp->window, tmp->data);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2985 tmp = NULL;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2986 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2987 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2988 if(tmp)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2989 tmp= tmp->next;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2990 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2991 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2992 if(LOWORD(mp1) == '\t')
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2993 {
82 aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	2994 if(GetAsyncKeyState(VK_SHIFT) & 0x8000)
61 4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	2995 _shift_focus_back(hwnd);
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	2996 else
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	2997 _shift_focus(hwnd);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2998 return FALSE;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2999 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3000 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3001 break;
61 4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	3002 case WM_KEYDOWN:
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	3003 if(mp1 == VK_LEFT \|\| mp1 == VK_UP)
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	3004 _shift_focus_back(hwnd);
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	3005 if(mp1 == VK_RIGHT \|\| mp1 == VK_DOWN)
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	3006 _shift_focus(hwnd);
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	3007 break;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3008 case WM_MOUSEMOVE:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3009 GetCursorPos(&point);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3010 GetWindowRect(hwnd, &rect);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3011
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3012 if(PtInRect(&rect, point))
17 f26eced21a30 Some more updates. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 15 diff changeset	3013 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3014 if(hwnd != GetCapture())
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3015 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3016 SetCapture(hwnd);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3017 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3018 if(!bMouseOver)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3019 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3020 bMouseOver = 1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3021 if(!*bubble->bubbletext)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3022 break;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3023
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3024 if(hwndBubble)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3025 {
82 aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	3026 _free_window_memory(hwndBubble, 0);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3027 DestroyWindow(hwndBubble);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3028 hwndBubble = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3029 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3030
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3031 if(!hwndBubble)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3032 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3033 POINTL ptlWork = {0,0};
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3034 ULONG ulColor = DW_CLR_YELLOW;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3035 SIZE size;
82 aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	3036 HFONT hFont, oldFont = (HFONT)0;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3037 HDC hdc;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3038 RECT rect;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3039 void *oldproc;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3040
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3041 /* Use the WS_EX_TOOLWINDOW extended style
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3042 * so the window doesn't get listed in the
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3043 * taskbar.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3044 */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3045 hwndBubble = CreateWindowEx(WS_EX_TOOLWINDOW,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3046 STATICCLASSNAME,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3047 bubble->bubbletext,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3048 BS_TEXT \| WS_POPUP \|
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3049 WS_BORDER \|
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3050 SS_CENTER,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3051 0,0,50,20,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3052 HWND_DESKTOP,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3053 NULL,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	3054 DWInstance,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3055 NULL);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3056
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3057 dw_window_set_font(hwndBubble, DefaultFont);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3058 dw_window_set_color(hwndBubble, DW_CLR_BLACK, DW_CLR_YELLOW);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3059
82 aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	3060 hFont = (HFONT)SendMessage(hwndBubble, WM_GETFONT, 0, 0);
aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	3061
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3062 hdc = GetDC(hwndBubble);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3063
82 aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	3064 if(hFont)
aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	3065 oldFont = (HFONT)SelectObject(hdc, hFont);
aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	3066
aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	3067 GetTextExtentPoint32(hdc, bubble->bubbletext, strlen(bubble->bubbletext), &size);
aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	3068
aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	3069 if(hFont)
aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	3070 SelectObject(hdc, oldFont);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3071
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3072 MapWindowPoints(hwnd, HWND_DESKTOP, (LPPOINT)&ptlWork, 1);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3073
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3074 GetWindowRect(hwnd, &rect);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3075
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3076 SetWindowPos(hwndBubble,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3077 HWND_TOP,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3078 ptlWork.x,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3079 ptlWork.y + (rect.bottom-rect.top) + 1,
82 aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	3080 size.cx + 8,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3081 size.cy + 2,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3082 SWP_NOACTIVATE \| SWP_SHOWWINDOW);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3083
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3084 ReleaseDC(hwndBubble, hdc);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3085 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3086 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3087 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3088 else{
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3089 /* Calling ReleaseCapture in Win95 also causes WM_CAPTURECHANGED
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3090 * to be sent. Be sure to account for that.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3091 */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3092 ReleaseCapture();
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3093
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3094 if(bMouseOver)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3095 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3096 bMouseOver = 0;
82 aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	3097 _free_window_memory(hwndBubble, 0);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3098 DestroyWindow(hwndBubble);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3099 hwndBubble = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3100 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3101 }
527 e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	3102 _wndproc(hwnd, msg, mp1, mp2);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3103 break;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3104 case WM_CAPTURECHANGED:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3105 /* This message means we are losing the capture for some reason
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3106 * Either because we intentionally lost it or another window
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3107 * stole it
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3108 */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3109 if(bMouseOver)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3110 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3111 bMouseOver = 0;
82 aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	3112 _free_window_memory(hwndBubble, 0);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3113 DestroyWindow(hwndBubble);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3114 hwndBubble = 0;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3115 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3116 break;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3117 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3118
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3119 if(!pOldProc)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3120 return DefWindowProc(hwnd, msg, mp1, mp2);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3121 return CallWindowProc(pOldProc, hwnd, msg, mp1, mp2);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3122 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3123
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3124 /* This function recalculates a notebook page for example
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3125 * during switching of notebook pages.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3126 */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3127 void _resize_notebook_page(HWND handle, int pageid)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3128 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3129 RECT rect;
191 634625c3239d Fixes for dw_color_xxxx_set() to accept OS/2 style colors, and fixed a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 185 diff changeset	3130 NotebookPage array = (NotebookPage )dw_window_get_data(handle, "_dw_array");
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3131
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3132 if(array && array[pageid])
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3133 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	3134 Box box = (Box )GetWindowLongPtr(array[pageid]->hwnd, GWLP_USERDATA);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3135
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3136 GetClientRect(handle,&rect);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3137 TabCtrl_AdjustRect(handle,FALSE,&rect);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3138 MoveWindow(array[pageid]->hwnd, rect.left, rect.top,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3139 rect.right - rect.left, rect.bottom-rect.top, TRUE);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3140 if(box && box->count)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3141 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3142 ShowWindow(box->items[0].hwnd, SW_HIDE);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3143 _do_resize(box, rect.right - rect.left, rect.bottom - rect.top);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3144 ShowWindow(box->items[0].hwnd, SW_SHOW);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3145 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3146
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3147 ShowWindow(array[pageid]->hwnd, SW_SHOWNORMAL);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3148 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3149 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3150
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3151 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3152 * Initializes the Dynamic Windows engine.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3153 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3154 * newthread: True if this is the only thread.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3155 * False if there is already a message loop running.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3156 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3157 int API dw_init(int newthread, int argc, char *argv[])
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3158 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3159 WNDCLASS wc;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3160 int z;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3161 INITCOMMONCONTROLSEX icc;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3162
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3163 icc.dwSize = sizeof(INITCOMMONCONTROLSEX);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3164 icc.dwICC = ICC_WIN95_CLASSES;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3165
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3166 InitCommonControlsEx(&icc);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3167
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3168 memset(lookup, 0, sizeof(HICON) * ICON_INDEX_LIMIT);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3169
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3170 /* Register the generic Dynamic Windows class */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3171 memset(&wc, 0, sizeof(WNDCLASS));
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3172 wc.style = CS_DBLCLKS;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3173 wc.lpfnWndProc = (WNDPROC)_wndproc;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3174 wc.cbClsExtra = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3175 wc.cbWndExtra = 32;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3176 wc.hbrBackground = NULL;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3177 wc.lpszMenuName = NULL;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3178 wc.lpszClassName = ClassName;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3179
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3180 RegisterClass(&wc);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3181
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3182 /* Register the splitbar control */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3183 memset(&wc, 0, sizeof(WNDCLASS));
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3184 wc.style = CS_DBLCLKS \| CS_HREDRAW \| CS_VREDRAW;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3185 wc.lpfnWndProc = (WNDPROC)_splitwndproc;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3186 wc.cbClsExtra = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3187 wc.cbWndExtra = 0;
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	3188 wc.hbrBackground = NULL;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3189 wc.lpszMenuName = NULL;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3190 wc.lpszClassName = SplitbarClassName;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3191
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3192 RegisterClass(&wc);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3193
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3194 /* Register a frame control like on OS/2 */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3195 memset(&wc, 0, sizeof(WNDCLASS));
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3196 wc.style = CS_DBLCLKS;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3197 wc.lpfnWndProc = (WNDPROC)_framewndproc;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3198 wc.cbClsExtra = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3199 wc.cbWndExtra = 32;
73 2f339dd13496 Added C/C++ style escape sequence processing. And fixed a couple OS/2 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 72 diff changeset	3200 wc.hbrBackground = (HBRUSH)GetSysColorBrush(COLOR_3DFACE);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3201 wc.hCursor = LoadCursor(NULL, IDC_ARROW);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3202 wc.lpszMenuName = NULL;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3203 wc.lpszClassName = FRAMECLASSNAME;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3204
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3205 RegisterClass(&wc);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3206
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3207 /* Create a set of brushes using the default OS/2 and DOS colors */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3208 for(z=0;z<18;z++)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3209 _colors[z] = CreateSolidBrush(RGB(_red[z],_green[z],_blue[z]));
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3210
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3211 /* Register an Object Windows class like OS/2 and Win2k+
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3212 * so similar functionality can be used on earlier releases
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3213 * of Windows.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3214 */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3215 memset(&wc, 0, sizeof(WNDCLASS));
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3216 wc.style = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3217 wc.lpfnWndProc = (WNDPROC)_wndproc;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3218 wc.cbClsExtra = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3219 wc.cbWndExtra = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3220 wc.hbrBackground = NULL;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3221 wc.hCursor = LoadCursor(NULL, IDC_ARROW);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3222 wc.lpszMenuName = NULL;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3223 wc.lpszClassName = ObjectClassName;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3224
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3225 RegisterClass(&wc);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3226
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3227 /* Since Windows 95/98/NT don't have a HWND_OBJECT class
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3228 * also known as a input only window, I will create a
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3229 * temporary window that isn't visible and really does nothing
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3230 * except temporarily hold the child windows before they are
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3231 * packed into their correct parent.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3232 */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3233
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3234 DW_HWND_OBJECT = CreateWindow(ObjectClassName, "", 0, 0, 0,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	3235 0, 0, HWND_DESKTOP, NULL, DWInstance, NULL);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3236
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3237 if(!DW_HWND_OBJECT)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3238 {
399 a7a561103eac Add flags parameter to dw_messagebox() to specify buttons and icon displayed. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 389 diff changeset	3239 dw_messagebox("Dynamic Windows", DW_MB_OK\|DW_MB_ERROR, "Could not initialize the object window. error code %d", GetLastError());
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3240 exit(1);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3241 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3242
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3243 /* We need the version to check capability like up-down controls */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3244 dwVersion = GetVersion();
75 c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	3245 dwComctlVer = GetDllVersion(TEXT("comctl32.dll"));
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3246
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3247 for(z=0;z<THREAD_LIMIT;z++)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3248 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3249 _foreground[z] = RGB(128,128,128);
369 39983df2b93d Updated the license information, and copyrights. Code to do background bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 355 diff changeset	3250 _background[z] = DW_RGB_TRANSPARENT;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3251 _hPen[z] = CreatePen(PS_SOLID, 1, _foreground[z]);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3252 _hBrush[z] = CreateSolidBrush(_foreground[z]);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3253 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3254
506 f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	3255 if(!IS_WINNTOR95)
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	3256 {
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	3257 /* Get function pointers for the Win2k/98 menu functions */
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	3258 HANDLE huser = LoadLibrary("user32");
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	3259
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	3260 MyGetMenuInfo = (void*)GetProcAddress(huser, "GetMenuInfo");
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	3261 MySetMenuInfo = (void*)GetProcAddress(huser, "SetMenuInfo");
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	3262 FreeLibrary(huser);
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	3263 }
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	3264
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3265 return 0;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3266 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3267
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3268 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3269 * Runs a message loop for Dynamic Windows.
150 2a0d7b57a6da Removed unnecessary parameters from dw_main(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 147 diff changeset	3270 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3271 void API dw_main(void)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3272 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3273 MSG msg;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3274
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	3275 _dwtid = dw_thread_id();
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	3276
204 098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	3277 while(GetMessage(&msg, NULL, 0, 0))
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3278 {
534 222b0f32e7c9 More Timer cleanups, but it still stops for no apparent reason! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 531 diff changeset	3279 if(msg.hwnd == NULL && msg.message == WM_TIMER)
222b0f32e7c9 More Timer cleanups, but it still stops for no apparent reason! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 531 diff changeset	3280 _wndproc(msg.hwnd, msg.message, msg.wParam, msg.lParam);
222b0f32e7c9 More Timer cleanups, but it still stops for no apparent reason! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 531 diff changeset	3281 else
222b0f32e7c9 More Timer cleanups, but it still stops for no apparent reason! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 531 diff changeset	3282 {
222b0f32e7c9 More Timer cleanups, but it still stops for no apparent reason! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 531 diff changeset	3283 TranslateMessage(&msg);
222b0f32e7c9 More Timer cleanups, but it still stops for no apparent reason! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 531 diff changeset	3284 DispatchMessage(&msg);
222b0f32e7c9 More Timer cleanups, but it still stops for no apparent reason! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 531 diff changeset	3285 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3286 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3287 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3288
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3289 /*
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	3290 * Runs a message loop for Dynamic Windows, for a period of milliseconds.
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	3291 * Parameters:
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	3292 * milliseconds: Number of milliseconds to run the loop for.
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	3293 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3294 void API dw_main_sleep(int milliseconds)
37 360bc6a5f1c9 Sync with latest Dynamic Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 34 diff changeset	3295 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3296 MSG msg;
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	3297 double start = (double)clock();
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	3298
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	3299 while(((clock() - start) / (CLOCKS_PER_SEC/1000)) <= milliseconds)
37 360bc6a5f1c9 Sync with latest Dynamic Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 34 diff changeset	3300 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3301 if(PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE))
37 360bc6a5f1c9 Sync with latest Dynamic Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 34 diff changeset	3302 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3303 GetMessage(&msg, NULL, 0, 0);
534 222b0f32e7c9 More Timer cleanups, but it still stops for no apparent reason! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 531 diff changeset	3304 if(msg.hwnd == NULL && msg.message == WM_TIMER)
222b0f32e7c9 More Timer cleanups, but it still stops for no apparent reason! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 531 diff changeset	3305 _wndproc(msg.hwnd, msg.message, msg.wParam, msg.lParam);
222b0f32e7c9 More Timer cleanups, but it still stops for no apparent reason! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 531 diff changeset	3306 else
222b0f32e7c9 More Timer cleanups, but it still stops for no apparent reason! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 531 diff changeset	3307 {
222b0f32e7c9 More Timer cleanups, but it still stops for no apparent reason! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 531 diff changeset	3308 TranslateMessage(&msg);
222b0f32e7c9 More Timer cleanups, but it still stops for no apparent reason! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 531 diff changeset	3309 DispatchMessage(&msg);
222b0f32e7c9 More Timer cleanups, but it still stops for no apparent reason! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 531 diff changeset	3310 }
37 360bc6a5f1c9 Sync with latest Dynamic Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 34 diff changeset	3311 }
360bc6a5f1c9 Sync with latest Dynamic Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 34 diff changeset	3312 else
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3313 Sleep(1);
37 360bc6a5f1c9 Sync with latest Dynamic Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 34 diff changeset	3314 }
360bc6a5f1c9 Sync with latest Dynamic Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 34 diff changeset	3315 }
360bc6a5f1c9 Sync with latest Dynamic Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 34 diff changeset	3316
360bc6a5f1c9 Sync with latest Dynamic Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 34 diff changeset	3317 /*
204 098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	3318 * Processes a single message iteration and returns.
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	3319 */
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	3320 void API dw_main_iteration(void)
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	3321 {
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	3322 MSG msg;
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	3323
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	3324 _dwtid = dw_thread_id();
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	3325
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	3326 if(GetMessage(&msg, NULL, 0, 0))
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	3327 {
534 222b0f32e7c9 More Timer cleanups, but it still stops for no apparent reason! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 531 diff changeset	3328 if(msg.hwnd == NULL && msg.message == WM_TIMER)
222b0f32e7c9 More Timer cleanups, but it still stops for no apparent reason! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 531 diff changeset	3329 _wndproc(msg.hwnd, msg.message, msg.wParam, msg.lParam);
222b0f32e7c9 More Timer cleanups, but it still stops for no apparent reason! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 531 diff changeset	3330 else
222b0f32e7c9 More Timer cleanups, but it still stops for no apparent reason! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 531 diff changeset	3331 {
222b0f32e7c9 More Timer cleanups, but it still stops for no apparent reason! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 531 diff changeset	3332 TranslateMessage(&msg);
222b0f32e7c9 More Timer cleanups, but it still stops for no apparent reason! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 531 diff changeset	3333 DispatchMessage(&msg);
222b0f32e7c9 More Timer cleanups, but it still stops for no apparent reason! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 531 diff changeset	3334 }
204 098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	3335 }
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	3336 }
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	3337
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	3338 /*
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3339 * Free's memory allocated by dynamic windows.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3340 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3341 * ptr: Pointer to dynamic windows allocated
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3342 * memory to be free()'d.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3343 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3344 void API dw_free(void *ptr)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3345 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3346 free(ptr);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3347 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3348
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3349 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3350 * Allocates and initializes a dialog struct.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3351 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3352 * data: User defined data to be passed to functions.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3353 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3354 DWDialog * API dw_dialog_new(void *data)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3355 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3356 DWDialog *tmp = malloc(sizeof(DWDialog));
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3357
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3358 tmp->eve = dw_event_new();
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3359 dw_event_reset(tmp->eve);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3360 tmp->data = data;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3361 tmp->done = FALSE;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3362 tmp->result = NULL;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3363
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3364 return tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3365 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3366
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3367 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3368 * Accepts a dialog struct and returns the given data to the
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3369 * initial called of dw_dialog_wait().
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3370 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3371 * dialog: Pointer to a dialog struct aquired by dw_dialog_new).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3372 * result: Data to be returned by dw_dialog_wait().
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3373 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3374 int API dw_dialog_dismiss(DWDialog dialog, void result)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3375 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3376 dialog->result = result;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3377 dw_event_post(dialog->eve);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3378 dialog->done = TRUE;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3379 return 0;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3380 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3381
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3382 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3383 * Accepts a dialog struct waits for dw_dialog_dismiss() to be
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3384 * called by a signal handler with the given dialog struct.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3385 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3386 * dialog: Pointer to a dialog struct aquired by dw_dialog_new).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3387 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3388 void * API dw_dialog_wait(DWDialog *dialog)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3389 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3390 MSG msg;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3391 void *tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3392
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3393 while (GetMessage(&msg,NULL,0,0))
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3394 {
200 446dd8cea477 Removed window parameter on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 197 diff changeset	3395 if(msg.hwnd == NULL && msg.message == WM_TIMER)
446dd8cea477 Removed window parameter on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 197 diff changeset	3396 _wndproc(msg.hwnd, msg.message, msg.wParam, msg.lParam);
534 222b0f32e7c9 More Timer cleanups, but it still stops for no apparent reason! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 531 diff changeset	3397 else
222b0f32e7c9 More Timer cleanups, but it still stops for no apparent reason! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 531 diff changeset	3398 {
222b0f32e7c9 More Timer cleanups, but it still stops for no apparent reason! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 531 diff changeset	3399 TranslateMessage(&msg);
222b0f32e7c9 More Timer cleanups, but it still stops for no apparent reason! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 531 diff changeset	3400 DispatchMessage(&msg);
222b0f32e7c9 More Timer cleanups, but it still stops for no apparent reason! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 531 diff changeset	3401 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3402 if(dialog->done)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3403 break;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3404 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3405 dw_event_close(&dialog->eve);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3406 tmp = dialog->result;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3407 free(dialog);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3408 return tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3409 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3410
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3411 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3412 * Displays a Message Box with given text and title..
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3413 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3414 * title: The title of the message box.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3415 * format: printf style format string.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3416 * ...: Additional variables for use in the format.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3417 */
399 a7a561103eac Add flags parameter to dw_messagebox() to specify buttons and icon displayed. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 389 diff changeset	3418 int API dw_messagebox(char title, int flags, char format, ...)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3419 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3420 va_list args;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3421 char outbuf[256];
399 a7a561103eac Add flags parameter to dw_messagebox() to specify buttons and icon displayed. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 389 diff changeset	3422 int rc;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3423
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3424 va_start(args, format);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3425 vsprintf(outbuf, format, args);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3426 va_end(args);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3427
399 a7a561103eac Add flags parameter to dw_messagebox() to specify buttons and icon displayed. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 389 diff changeset	3428 rc = MessageBox(HWND_DESKTOP, outbuf, title, flags);
a7a561103eac Add flags parameter to dw_messagebox() to specify buttons and icon displayed. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 389 diff changeset	3429 if(rc == IDOK)
a7a561103eac Add flags parameter to dw_messagebox() to specify buttons and icon displayed. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 389 diff changeset	3430 return DW_MB_RETURN_OK;
a7a561103eac Add flags parameter to dw_messagebox() to specify buttons and icon displayed. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 389 diff changeset	3431 else if(rc == IDYES)
a7a561103eac Add flags parameter to dw_messagebox() to specify buttons and icon displayed. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 389 diff changeset	3432 return DW_MB_RETURN_YES;
a7a561103eac Add flags parameter to dw_messagebox() to specify buttons and icon displayed. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 389 diff changeset	3433 else if(rc == IDNO)
a7a561103eac Add flags parameter to dw_messagebox() to specify buttons and icon displayed. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 389 diff changeset	3434 return DW_MB_RETURN_NO;
a7a561103eac Add flags parameter to dw_messagebox() to specify buttons and icon displayed. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 389 diff changeset	3435 else if(rc == IDCANCEL)
a7a561103eac Add flags parameter to dw_messagebox() to specify buttons and icon displayed. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 389 diff changeset	3436 return DW_MB_RETURN_CANCEL;
a7a561103eac Add flags parameter to dw_messagebox() to specify buttons and icon displayed. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 389 diff changeset	3437 else return 0;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3438 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3439
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3440 /*
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3441 * Minimizes or Iconifies a top-level window.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3442 * Parameters:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3443 * handle: The window handle to minimize.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3444 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3445 int API dw_window_minimize(HWND handle)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3446 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3447 return ShowWindow(handle, SW_MINIMIZE);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3448 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3449
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3450 /*
40 88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	3451 * Makes the window topmost.
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	3452 * Parameters:
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	3453 * handle: The window handle to make topmost.
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	3454 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3455 int API dw_window_raise(HWND handle)
40 88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	3456 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3457 return SetWindowPos(handle, HWND_TOP, 0, 0, 0, 0, SWP_NOACTIVATE \| SWP_NOMOVE \| SWP_NOSIZE);
40 88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	3458 }
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	3459
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	3460 /*
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	3461 * Makes the window bottommost.
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	3462 * Parameters:
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	3463 * handle: The window handle to make bottommost.
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	3464 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3465 int API dw_window_lower(HWND handle)
40 88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	3466 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3467 return SetWindowPos(handle, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOACTIVATE \| SWP_NOMOVE \| SWP_NOSIZE);
40 88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	3468 }
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	3469
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	3470 /*
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3471 * Makes the window visible.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3472 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3473 * handle: The window handle to make visible.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3474 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3475 int API dw_window_show(HWND handle)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3476 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3477 int rc = ShowWindow(handle, SW_SHOW);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3478 SetFocus(handle);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3479 _initial_focus(handle);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3480 return rc;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3481 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3482
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3483 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3484 * Makes the window invisible.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3485 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3486 * handle: The window handle to make visible.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3487 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3488 int API dw_window_hide(HWND handle)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3489 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3490 return ShowWindow(handle, SW_HIDE);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3491 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3492
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3493 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3494 * Destroys a window and all of it's children.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3495 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3496 * handle: The window handle to destroy.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3497 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3498 int API dw_window_destroy(HWND handle)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3499 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3500 HWND parent = GetParent(handle);
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	3501 Box thisbox = (Box )GetWindowLongPtr(parent, GWLP_USERDATA);
506 f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	3502
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	3503 if(!IS_WINNTOR95)
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	3504 {
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	3505 HMENU menu = GetMenu(handle);
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	3506
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	3507 if(menu)
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	3508 _free_menu_data(menu);
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	3509 }
54 c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3510
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3511 if(parent != HWND_DESKTOP && thisbox && thisbox->count)
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3512 {
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3513 int z, index = -1;
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3514 Item tmpitem, thisitem = thisbox->items;
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3515
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3516 for(z=0;z<thisbox->count;z++)
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3517 {
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3518 if(thisitem[z].hwnd == handle)
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3519 index = z;
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3520 }
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3521
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3522 if(index == -1)
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3523 return 0;
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3524
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3525 tmpitem = malloc(sizeof(Item)*(thisbox->count-1));
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3526
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3527 /* Copy all but the current entry to the new list */
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3528 for(z=0;z<index;z++)
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3529 {
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3530 tmpitem[z] = thisitem[z];
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3531 }
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3532 for(z=index+1;z<thisbox->count;z++)
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3533 {
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3534 tmpitem[z-1] = thisitem[z];
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3535 }
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3536
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3537 thisbox->items = tmpitem;
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3538 free(thisitem);
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3539 thisbox->count--;
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	3540 _free_window_memory(handle, 0);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	3541 EnumChildWindows(handle, _free_window_memory, 0);
54 c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3542 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3543 return DestroyWindow(handle);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3544 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3545
54 c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3546 /* Causes entire window to be invalidated and redrawn.
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3547 * Parameters:
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3548 * handle: Toplevel window handle to be redrawn.
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3549 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3550 void API dw_window_redraw(HWND handle)
54 c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3551 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	3552 Box mybox = (Box )GetWindowLongPtr(handle, GWLP_USERDATA);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3553
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3554 if(mybox)
54 c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3555 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3556 RECT rect;
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	3557 int istoplevel = (GetParent(handle) == HWND_DESKTOP);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3558
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3559 GetClientRect(handle, &rect);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3560
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	3561 ShowWindow(istoplevel ? mybox->items[0].hwnd : handle, SW_HIDE);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3562 _do_resize(mybox, rect.right - rect.left, rect.bottom - rect.top);
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	3563 ShowWindow(istoplevel ? mybox->items[0].hwnd : handle, SW_SHOW);
54 c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3564 }
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3565 }
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	3566
411 a3a299455c67 Added parsing for " Bold" and " Italic" in the font name so it behaves bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 399 diff changeset	3567 int instring(char text, char buffer)
a3a299455c67 Added parsing for " Bold" and " Italic" in the font name so it behaves bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 399 diff changeset	3568 {
a3a299455c67 Added parsing for " Bold" and " Italic" in the font name so it behaves bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 399 diff changeset	3569 int z, len = strlen(text), buflen = strlen(buffer);
a3a299455c67 Added parsing for " Bold" and " Italic" in the font name so it behaves bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 399 diff changeset	3570
a3a299455c67 Added parsing for " Bold" and " Italic" in the font name so it behaves bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 399 diff changeset	3571 if(buflen > len)
a3a299455c67 Added parsing for " Bold" and " Italic" in the font name so it behaves bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 399 diff changeset	3572 {
414 2a55f61714fd Off by 1 test in _acquire_font(). "10.Terminal Bold" now works. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 411 diff changeset	3573 for(z=0;z<=(buflen-len);z++)
411 a3a299455c67 Added parsing for " Bold" and " Italic" in the font name so it behaves bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 399 diff changeset	3574 {
a3a299455c67 Added parsing for " Bold" and " Italic" in the font name so it behaves bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 399 diff changeset	3575 if(memcmp(text, &buffer[z], len) == 0)
439 7f39be80dec3 Hopefully better method of removing the font modifiers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 438 diff changeset	3576 return z;
411 a3a299455c67 Added parsing for " Bold" and " Italic" in the font name so it behaves bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 399 diff changeset	3577 }
a3a299455c67 Added parsing for " Bold" and " Italic" in the font name so it behaves bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 399 diff changeset	3578 }
a3a299455c67 Added parsing for " Bold" and " Italic" in the font name so it behaves bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 399 diff changeset	3579 return 0;
a3a299455c67 Added parsing for " Bold" and " Italic" in the font name so it behaves bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 399 diff changeset	3580 }
a3a299455c67 Added parsing for " Bold" and " Italic" in the font name so it behaves bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 399 diff changeset	3581
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3582 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3583 * Changes a window's parent to newparent.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3584 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3585 * handle: The window handle to destroy.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3586 * newparent: The window's new parent window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3587 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3588 void API dw_window_reparent(HWND handle, HWND newparent)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3589 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3590 SetParent(handle, newparent);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3591 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3592
67 ab9b0fa6c66e Focus fixes and removal of several hack in the OS/2 code base. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 63 diff changeset	3593 HFONT _acquire_font(HWND handle, char *fontname)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3594 {
452 cf00d6e2b3cc Optimizations to the layout engine on OS/2 and Windows, eliminated 3 MUL bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 451 diff changeset	3595 HFONT hfont = 0;
cf00d6e2b3cc Optimizations to the layout engine on OS/2 and Windows, eliminated 3 MUL bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 451 diff changeset	3596
cf00d6e2b3cc Optimizations to the layout engine on OS/2 and Windows, eliminated 3 MUL bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 451 diff changeset	3597 if(fontname != DefaultFont && fontname[0])
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3598 {
439 7f39be80dec3 Hopefully better method of removing the font modifiers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 438 diff changeset	3599 int Italic, Bold;
7f39be80dec3 Hopefully better method of removing the font modifiers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 438 diff changeset	3600 char *myFontName;
7f39be80dec3 Hopefully better method of removing the font modifiers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 438 diff changeset	3601 int z, size = 9;
7f39be80dec3 Hopefully better method of removing the font modifiers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 438 diff changeset	3602 LOGFONT lf;
67 ab9b0fa6c66e Focus fixes and removal of several hack in the OS/2 code base. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 63 diff changeset	3603 #if 0
ab9b0fa6c66e Focus fixes and removal of several hack in the OS/2 code base. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 63 diff changeset	3604 HDC hDC = GetDC(handle);
ab9b0fa6c66e Focus fixes and removal of several hack in the OS/2 code base. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 63 diff changeset	3605 #endif
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3606 for(z=0;z<strlen(fontname);z++)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3607 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3608 if(fontname[z]=='.')
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3609 break;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3610 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3611 size = atoi(fontname) + 5;
439 7f39be80dec3 Hopefully better method of removing the font modifiers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 438 diff changeset	3612 Italic = instring(" Italic", &fontname[z+1]);
7f39be80dec3 Hopefully better method of removing the font modifiers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 438 diff changeset	3613 Bold = instring(" Bold", &fontname[z+1]);
67 ab9b0fa6c66e Focus fixes and removal of several hack in the OS/2 code base. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 63 diff changeset	3614 #if 0
ab9b0fa6c66e Focus fixes and removal of several hack in the OS/2 code base. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 63 diff changeset	3615 lf.lfHeight = -MulDiv(size, GetDeviceCaps(hDC, LOGPIXELSY), 72);
ab9b0fa6c66e Focus fixes and removal of several hack in the OS/2 code base. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 63 diff changeset	3616 #endif
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3617 lf.lfHeight = size;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3618 lf.lfWidth = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3619 lf.lfEscapement = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3620 lf.lfOrientation = 0;
439 7f39be80dec3 Hopefully better method of removing the font modifiers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 438 diff changeset	3621 lf.lfItalic = Italic ? TRUE : FALSE;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3622 lf.lfUnderline = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3623 lf.lfStrikeOut = 0;
439 7f39be80dec3 Hopefully better method of removing the font modifiers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 438 diff changeset	3624 lf.lfWeight = Bold ? FW_BOLD : FW_NORMAL;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3625 lf.lfCharSet = DEFAULT_CHARSET;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3626 lf.lfOutPrecision = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3627 lf.lfClipPrecision = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3628 lf.lfQuality = DEFAULT_QUALITY;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3629 lf.lfPitchAndFamily = DEFAULT_PITCH \| FW_DONTCARE;
436 98d6c00fe11e Fix bug with specifying fonts with modifiers; the modifiers were not being mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 429 diff changeset	3630 /*
439 7f39be80dec3 Hopefully better method of removing the font modifiers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 438 diff changeset	3631 * remove any font modifiers
436 98d6c00fe11e Fix bug with specifying fonts with modifiers; the modifiers were not being mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 429 diff changeset	3632 */
98d6c00fe11e Fix bug with specifying fonts with modifiers; the modifiers were not being mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 429 diff changeset	3633 myFontName = strdup(&fontname[z+1]);
439 7f39be80dec3 Hopefully better method of removing the font modifiers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 438 diff changeset	3634 if(Italic)
7f39be80dec3 Hopefully better method of removing the font modifiers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 438 diff changeset	3635 myFontName[Italic] = 0;
7f39be80dec3 Hopefully better method of removing the font modifiers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 438 diff changeset	3636 if(Bold)
7f39be80dec3 Hopefully better method of removing the font modifiers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 438 diff changeset	3637 myFontName[Bold] = 0;
436 98d6c00fe11e Fix bug with specifying fonts with modifiers; the modifiers were not being mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 429 diff changeset	3638 strcpy(lf.lfFaceName, myFontName);
98d6c00fe11e Fix bug with specifying fonts with modifiers; the modifiers were not being mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 429 diff changeset	3639 free(myFontName);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3640
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3641 hfont = CreateFontIndirect(&lf);
67 ab9b0fa6c66e Focus fixes and removal of several hack in the OS/2 code base. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 63 diff changeset	3642 #if 0
ab9b0fa6c66e Focus fixes and removal of several hack in the OS/2 code base. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 63 diff changeset	3643 ReleaseDC(handle, hDC);
ab9b0fa6c66e Focus fixes and removal of several hack in the OS/2 code base. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 63 diff changeset	3644 #endif
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3645 }
452 cf00d6e2b3cc Optimizations to the layout engine on OS/2 and Windows, eliminated 3 MUL bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 451 diff changeset	3646 if(!hfont)
cf00d6e2b3cc Optimizations to the layout engine on OS/2 and Windows, eliminated 3 MUL bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 451 diff changeset	3647 hfont = GetStockObject(DEFAULT_GUI_FONT);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3648 return hfont;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3649 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3650
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3651 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3652 * Sets the font used by a specified window (widget) handle.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3653 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3654 * handle: The window (widget) handle.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3655 * fontname: Name and size of the font in the form "size.fontname"
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3656 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3657 int API dw_window_set_font(HWND handle, char *fontname)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3658 {
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	3659 HFONT oldfont = (HFONT)SendMessage(handle, WM_GETFONT, 0, 0);
67 ab9b0fa6c66e Focus fixes and removal of several hack in the OS/2 code base. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 63 diff changeset	3660 HFONT hfont = _acquire_font(handle, fontname);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3661 ColorInfo *cinfo;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3662
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	3663 cinfo = (ColorInfo *)GetWindowLongPtr(handle, GWLP_USERDATA);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3664
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3665 if(fontname)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3666 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3667 if(cinfo)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3668 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3669 strcpy(cinfo->fontname, fontname);
455 dd04a4d781f8 Fixes GDI font object leak when calling dw_window_set_font() on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 454 diff changeset	3670 if(!oldfont)
dd04a4d781f8 Fixes GDI font object leak when calling dw_window_set_font() on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 454 diff changeset	3671 oldfont = cinfo->hfont;
dd04a4d781f8 Fixes GDI font object leak when calling dw_window_set_font() on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 454 diff changeset	3672 cinfo->hfont = hfont;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3673 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3674 else
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3675 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3676 cinfo = calloc(1, sizeof(ColorInfo));
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3677 cinfo->fore = cinfo->back = -1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3678
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3679 strcpy(cinfo->fontname, fontname);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3680
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3681 cinfo->pOldProc = SubclassWindow(handle, _colorwndproc);
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	3682 SetWindowLongPtr(handle, GWLP_USERDATA, (LONG_PTR)cinfo);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3683 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3684 }
67 ab9b0fa6c66e Focus fixes and removal of several hack in the OS/2 code base. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 63 diff changeset	3685 SendMessage(handle, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE);
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	3686 if(oldfont)
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	3687 DeleteObject(oldfont);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3688 return 0;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3689 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3690
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3691 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3692 * Sets the colors used by a specified window (widget) handle.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3693 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3694 * handle: The window (widget) handle.
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3695 * fore: Foreground color in RGB format.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3696 * back: Background color in RGB format.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3697 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3698 int API dw_window_set_color(HWND handle, ULONG fore, ULONG back)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3699 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3700 ColorInfo *cinfo;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3701 char tmpbuf[100];
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3702
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	3703 cinfo = (ColorInfo *)GetWindowLongPtr(handle, GWLP_USERDATA);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3704
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3705 GetClassName(handle, tmpbuf, 99);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3706
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3707 if(strnicmp(tmpbuf, WC_LISTVIEW, strlen(WC_LISTVIEW))==0)
7 005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	3708 {
191 634625c3239d Fixes for dw_color_xxxx_set() to accept OS/2 style colors, and fixed a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 185 diff changeset	3709 fore = _internal_color(fore);
634625c3239d Fixes for dw_color_xxxx_set() to accept OS/2 style colors, and fixed a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 185 diff changeset	3710 back = _internal_color(back);
634625c3239d Fixes for dw_color_xxxx_set() to accept OS/2 style colors, and fixed a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 185 diff changeset	3711
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3712 ListView_SetTextColor(handle, RGB(DW_RED_VALUE(fore),
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3713 DW_GREEN_VALUE(fore),
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3714 DW_BLUE_VALUE(fore)));
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3715 ListView_SetTextBkColor(handle, RGB(DW_RED_VALUE(back),
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3716 DW_GREEN_VALUE(back),
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3717 DW_BLUE_VALUE(back)));
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3718 ListView_SetBkColor(handle, RGB(DW_RED_VALUE(back),
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3719 DW_GREEN_VALUE(back),
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3720 DW_BLUE_VALUE(back)));
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3721 InvalidateRgn(handle, NULL, TRUE);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3722 return TRUE;
7 005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	3723 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3724
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3725 if(cinfo)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3726 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3727 cinfo->fore = fore;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3728 cinfo->back = back;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3729 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3730 else
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3731 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3732 cinfo = calloc(1, sizeof(ColorInfo));
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3733
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3734 cinfo->fore = fore;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3735 cinfo->back = back;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3736
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3737 cinfo->pOldProc = SubclassWindow(handle, _colorwndproc);
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	3738 SetWindowLongPtr(handle, GWLP_USERDATA, (LONG_PTR)cinfo);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3739 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3740 InvalidateRgn(handle, NULL, TRUE);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3741 return TRUE;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3742 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3743
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3744 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3745 * Sets the font used by a specified window (widget) handle.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3746 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3747 * handle: The window (widget) handle.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3748 * border: Size of the window border in pixels.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3749 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3750 int API dw_window_set_border(HWND handle, int border)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3751 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3752 return 0;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3753 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3754
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3755 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3756 * Captures the mouse input to this window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3757 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3758 * handle: Handle to receive mouse input.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3759 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3760 void API dw_window_capture(HWND handle)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3761 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3762 SetCapture(handle);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3763 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3764
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3765 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3766 * Releases previous mouse capture.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3767 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3768 void API dw_window_release(void)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3769 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3770 ReleaseCapture();
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3771 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3772
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3773 /*
22 6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	3774 * Changes the appearance of the mouse pointer.
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	3775 * Parameters:
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	3776 * handle: Handle to widget for which to change.
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	3777 * cursortype: ID of the pointer you want.
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	3778 */
510 710f82598210 Change function names to be inline with Mark Hessling's Rexx/DW. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 509 diff changeset	3779 void API dw_window_set_pointer(HWND handle, int pointertype)
22 6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	3780 {
527 e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	3781 HCURSOR cursor = pointertype < 65536 ? LoadCursor(NULL, MAKEINTRESOURCE(pointertype)) : (HCURSOR)pointertype;
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	3782
531 79696a852401 Added DW_POINTER_DEFAULT, this will return the pointer to the default bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 527 diff changeset	3783 if(!pointertype)
79696a852401 Added DW_POINTER_DEFAULT, this will return the pointer to the default bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 527 diff changeset	3784 dw_window_set_data(handle, "_dw_cursor", 0);
79696a852401 Added DW_POINTER_DEFAULT, this will return the pointer to the default bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 527 diff changeset	3785 else
79696a852401 Added DW_POINTER_DEFAULT, this will return the pointer to the default bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 527 diff changeset	3786 {
79696a852401 Added DW_POINTER_DEFAULT, this will return the pointer to the default bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 527 diff changeset	3787 dw_window_set_data(handle, "_dw_cursor", (void *)cursor);
79696a852401 Added DW_POINTER_DEFAULT, this will return the pointer to the default bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 527 diff changeset	3788 SetCursor(cursor);
79696a852401 Added DW_POINTER_DEFAULT, this will return the pointer to the default bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 527 diff changeset	3789 }
22 6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	3790 }
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	3791
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	3792 /*
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3793 * Create a new Window Frame.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3794 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3795 * owner: The Owner's window handle or HWND_DESKTOP.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3796 * title: The Window title.
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3797 * flStyle: Style flags, see the DW reference.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3798 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3799 HWND API dw_window_new(HWND hwndOwner, char *title, ULONG flStyle)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3800 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3801 HWND hwndframe;
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	3802 Box *newbox = calloc(sizeof(Box), 1);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3803 ULONG flStyleEx = 0;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3804
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3805 newbox->pad = 0;
283 54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	3806 newbox->type = DW_VERT;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3807 newbox->count = 0;
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	3808 newbox->cinfo.fore = newbox->cinfo.back = -1;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3809
522 29547598b909 For whatever reason the new WS_EX_MDICHILD method is not working properly, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 516 diff changeset	3810 /* Hmm, the "correct" way doesn't seem to be
29547598b909 For whatever reason the new WS_EX_MDICHILD method is not working properly, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 516 diff changeset	3811 * working, but the old hackish SetParent()
29547598b909 For whatever reason the new WS_EX_MDICHILD method is not working properly, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 516 diff changeset	3812 * at the bottom seems to work, so I'll leave
29547598b909 For whatever reason the new WS_EX_MDICHILD method is not working properly, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 516 diff changeset	3813 * it like this for now.
29547598b909 For whatever reason the new WS_EX_MDICHILD method is not working properly, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 516 diff changeset	3814 */
29547598b909 For whatever reason the new WS_EX_MDICHILD method is not working properly, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 516 diff changeset	3815 #if 0
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3816 if(hwndOwner)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3817 flStyleEx \|= WS_EX_MDICHILD;
522 29547598b909 For whatever reason the new WS_EX_MDICHILD method is not working properly, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 516 diff changeset	3818 #endif
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3819
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3820 if(!(flStyle & WS_CAPTION))
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3821 flStyle \|= WS_POPUPWINDOW;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3822
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3823 if(flStyle & DW_FCF_TASKLIST)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3824 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3825 ULONG newflags = (flStyle \| WS_CLIPCHILDREN) & ~DW_FCF_TASKLIST;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3826
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3827 hwndframe = CreateWindowEx(flStyleEx, ClassName, title, newflags, CW_USEDEFAULT, CW_USEDEFAULT,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	3828 CW_USEDEFAULT, CW_USEDEFAULT, hwndOwner, NULL, DWInstance, NULL);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3829 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3830 else
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3831 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3832 flStyleEx \|= WS_EX_TOOLWINDOW;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3833
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3834 hwndframe = CreateWindowEx(flStyleEx, ClassName, title, flStyle \| WS_CLIPCHILDREN, CW_USEDEFAULT, CW_USEDEFAULT,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	3835 CW_USEDEFAULT, CW_USEDEFAULT, hwndOwner, NULL, DWInstance, NULL);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3836 }
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	3837 SetWindowLongPtr(hwndframe, GWLP_USERDATA, (LONG_PTR)newbox);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3838
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3839 if(hwndOwner)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3840 SetParent(hwndframe, hwndOwner);
12 26e2130135b9 Many Win32 and GTK fixes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 7 diff changeset	3841
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3842 return hwndframe;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3843 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3844
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3845 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3846 * Create a new Box to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3847 * Parameters:
283 54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	3848 * type: Either DW_VERT (vertical) or DW_HORZ (horizontal).
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3849 * pad: Number of pixels to pad around the box.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3850 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3851 HWND API dw_box_new(int type, int pad)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3852 {
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	3853 Box *newbox = calloc(sizeof(Box), 1);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3854 HWND hwndframe;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3855
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3856 newbox->pad = pad;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3857 newbox->type = type;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3858 newbox->count = 0;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3859 newbox->grouphwnd = (HWND)NULL;
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	3860 newbox->cinfo.fore = newbox->cinfo.back = -1;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3861
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3862 hwndframe = CreateWindow(FRAMECLASSNAME,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3863 "",
107 cd0e5cf92f6a Rewrote the Windows packing code so it is more like OS/2 to improve window bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 106 diff changeset	3864 WS_VISIBLE \| WS_CHILD \| WS_CLIPCHILDREN,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3865 0,0,2000,1000,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3866 DW_HWND_OBJECT,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3867 NULL,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	3868 DWInstance,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3869 NULL);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3870
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3871 newbox->cinfo.pOldProc = SubclassWindow(hwndframe, _colorwndproc);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3872 newbox->cinfo.fore = newbox->cinfo.back = -1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3873
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	3874 SetWindowLongPtr(hwndframe, GWLP_USERDATA, (LONG_PTR)newbox);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3875 return hwndframe;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3876 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3877
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3878 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3879 * Create a new Group Box to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3880 * Parameters:
283 54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	3881 * type: Either DW_VERT (vertical) or DW_HORZ (horizontal).
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3882 * pad: Number of pixels to pad around the box.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3883 * title: Text to be displayined in the group outline.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3884 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3885 HWND API dw_groupbox_new(int type, int pad, char *title)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3886 {
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	3887 Box *newbox = calloc(sizeof(Box), 1);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3888 HWND hwndframe;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3889
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3890 newbox->pad = pad;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3891 newbox->type = type;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3892 newbox->count = 0;
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	3893 newbox->cinfo.fore = newbox->cinfo.back = -1;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3894
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3895 hwndframe = CreateWindow(FRAMECLASSNAME,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3896 "",
107 cd0e5cf92f6a Rewrote the Windows packing code so it is more like OS/2 to improve window bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 106 diff changeset	3897 WS_VISIBLE \| WS_CHILD,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3898 0,0,2000,1000,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3899 DW_HWND_OBJECT,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3900 NULL,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	3901 DWInstance,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3902 NULL);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3903
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3904 newbox->grouphwnd = CreateWindow(BUTTONCLASSNAME,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3905 title,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3906 WS_CHILD \| BS_GROUPBOX \|
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3907 WS_VISIBLE \| WS_CLIPCHILDREN,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3908 0,0,2000,1000,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3909 hwndframe,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3910 NULL,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	3911 DWInstance,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3912 NULL);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3913
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	3914 SetWindowLongPtr(hwndframe, GWLP_USERDATA, (LONG_PTR)newbox);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3915 dw_window_set_font(newbox->grouphwnd, DefaultFont);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3916 return hwndframe;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3917 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3918
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3919 /*
14 176cee043f1b Lots of Windows and Unix bug fixes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 12 diff changeset	3920 * Create a new MDI Frame to be packed.
176cee043f1b Lots of Windows and Unix bug fixes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 12 diff changeset	3921 * Parameters:
176cee043f1b Lots of Windows and Unix bug fixes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 12 diff changeset	3922 * id: An ID to be used with dw_window_from_id or 0L.
176cee043f1b Lots of Windows and Unix bug fixes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 12 diff changeset	3923 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3924 HWND API dw_mdi_new(unsigned long id)
14 176cee043f1b Lots of Windows and Unix bug fixes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 12 diff changeset	3925 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3926 CLIENTCREATESTRUCT ccs;
14 176cee043f1b Lots of Windows and Unix bug fixes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 12 diff changeset	3927 HWND hwndframe;
176cee043f1b Lots of Windows and Unix bug fixes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 12 diff changeset	3928
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3929 ccs.hWindowMenu = NULL;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3930 ccs.idFirstChild = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3931
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3932 hwndframe = CreateWindow("MDICLIENT",
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3933 "",
107 cd0e5cf92f6a Rewrote the Windows packing code so it is more like OS/2 to improve window bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 106 diff changeset	3934 WS_VISIBLE \| WS_CHILD \| WS_CLIPSIBLINGS,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3935 0,0,2000,1000,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3936 DW_HWND_OBJECT,
119 1cad81b7cc4c Implemented initial splitbar code on Unix. And made some fixes for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 118 diff changeset	3937 (HMENU)id,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3938 DWInstance,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3939 &ccs);
14 176cee043f1b Lots of Windows and Unix bug fixes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 12 diff changeset	3940 return hwndframe;
176cee043f1b Lots of Windows and Unix bug fixes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 12 diff changeset	3941 }
176cee043f1b Lots of Windows and Unix bug fixes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 12 diff changeset	3942
176cee043f1b Lots of Windows and Unix bug fixes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 12 diff changeset	3943 /*
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3944 * Create a bitmap object to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3945 * Parameters:
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3946 * id: An ID to be used with dw_window_from_id or 0L.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3947 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3948 HWND API dw_bitmap_new(ULONG id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3949 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3950 return CreateWindow(STATICCLASSNAME,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3951 "",
107 cd0e5cf92f6a Rewrote the Windows packing code so it is more like OS/2 to improve window bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 106 diff changeset	3952 SS_BITMAP \| WS_VISIBLE \|
cd0e5cf92f6a Rewrote the Windows packing code so it is more like OS/2 to improve window bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 106 diff changeset	3953 WS_CHILD \| WS_CLIPCHILDREN,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3954 0,0,2000,1000,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3955 DW_HWND_OBJECT,
119 1cad81b7cc4c Implemented initial splitbar code on Unix. And made some fixes for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 118 diff changeset	3956 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	3957 DWInstance,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3958 NULL);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3959 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3960
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3961 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3962 * Create a notebook object to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3963 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3964 * id: An ID to be used for getting the resource from the
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3965 * resource file.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3966 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3967 HWND API dw_notebook_new(ULONG id, int top)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3968 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3969 ULONG flags = 0;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3970 HWND tmp;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3971 NotebookPage *array = calloc(256, sizeof(NotebookPage ));
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3972
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3973 if(!top)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3974 flags = TCS_BOTTOM;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3975
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3976 tmp = CreateWindow(WC_TABCONTROL,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3977 "",
107 cd0e5cf92f6a Rewrote the Windows packing code so it is more like OS/2 to improve window bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 106 diff changeset	3978 WS_VISIBLE \| WS_CHILD \| WS_CLIPCHILDREN,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3979 0,0,2000,1000,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3980 DW_HWND_OBJECT,
119 1cad81b7cc4c Implemented initial splitbar code on Unix. And made some fixes for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 118 diff changeset	3981 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	3982 DWInstance,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3983 NULL);
191 634625c3239d Fixes for dw_color_xxxx_set() to accept OS/2 style colors, and fixed a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 185 diff changeset	3984 dw_window_set_data(tmp, "_dw_array", (void *)array);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3985 dw_window_set_font(tmp, DefaultFont);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3986 return tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3987 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3988
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3989 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3990 * Create a menu object to be popped up.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3991 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3992 * id: An ID to be used for getting the resource from the
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3993 * resource file.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3994 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3995 HMENUI API dw_menu_new(ULONG id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3996 {
238 13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	3997 return (HMENUI)CreatePopupMenu();
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3998 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3999
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4000 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4001 * Create a menubar on a window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4002 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4003 * location: Handle of a window frame to be attached to.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4004 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4005 HMENUI API dw_menubar_new(HWND location)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4006 {
185 f55677513954 Updated the menu code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 182 diff changeset	4007 HMENUI tmp;
f55677513954 Updated the menu code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 182 diff changeset	4008
238 13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4009 tmp = (HMENUI)CreateMenu();
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4010
506 f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	4011 if(!IS_WINNTOR95)
466 c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	4012 {
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	4013 MENUINFO mi;
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	4014
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	4015 mi.cbSize = sizeof(MENUINFO);
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	4016 mi.fMask = MIM_MENUDATA;
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	4017 mi.dwMenuData = (ULONG_PTR)1;
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	4018
506 f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	4019 MySetMenuInfo((HMENU)tmp, &mi);
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	4020 }
466 c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	4021
238 13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4022 dw_window_set_data(location, "_dw_menu", (void *)tmp);
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4023
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4024 SetMenu(location, (HMENU)tmp);
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4025 return location;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4026 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4027
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4028 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4029 * Destroys a menu created with dw_menubar_new or dw_menu_new.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4030 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4031 * menu: Handle of a menu.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4032 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4033 void API dw_menu_destroy(HMENUI *menu)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4034 {
185 f55677513954 Updated the menu code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 182 diff changeset	4035 if(menu)
238 13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4036 {
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4037 HMENU mymenu = (HMENU)*menu;
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4038
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4039 if(IsWindow((HWND)mymenu) && !IsMenu(mymenu))
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4040 mymenu = (HMENU)dw_window_get_data((HWND)mymenu, "_dw_menu");
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4041 if(IsMenu(mymenu))
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4042 DestroyMenu(mymenu);
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4043 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4044 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4045
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4046 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4047 * Adds a menuitem or submenu to an existing menu.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4048 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4049 * menu: The handle the the existing menu.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4050 * title: The title text on the menu item to be added.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4051 * id: An ID to be used for message passing.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4052 * end: If TRUE memu is positioned at the end of the menu.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4053 * check: If TRUE menu is "check"able.
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4054 * flags: Extended attributes to set on the menu.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4055 * submenu: Handle to an existing menu to be a submenu or NULL.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4056 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4057 HWND API dw_menu_append_item(HMENUI menux, char *title, ULONG id, ULONG flags, int end, int check, HMENUI submenu)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4058 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4059 MENUITEMINFO mii;
238 13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4060 HMENU mymenu = (HMENU)menux;
466 c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	4061 char buffer[15];
238 13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4062
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4063 if(IsWindow(menux) && !IsMenu(mymenu))
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4064 mymenu = (HMENU)dw_window_get_data(menux, "_dw_menu");
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4065
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4066 mii.cbSize = sizeof(MENUITEMINFO);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4067 mii.fMask = MIIM_ID \| MIIM_SUBMENU \| MIIM_TYPE;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4068
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4069 /* Convert from OS/2 style accellerators to Win32 style */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4070 if(title)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4071 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4072 char *tmp = title;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4073
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4074 while(*tmp)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4075 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4076 if(*tmp == '~')
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4077 *tmp = '&';
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4078 tmp++;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4079 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4080 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4081
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4082 if(title && *title)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4083 mii.fType = MFT_STRING;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4084 else
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4085 mii.fType = MFT_SEPARATOR;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4086
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4087 mii.wID = id;
238 13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4088 if(IsMenu((HMENU)submenu))
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4089 mii.hSubMenu = (HMENU)submenu;
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4090 else
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4091 mii.hSubMenu = 0;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4092 mii.dwTypeData = title;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4093 mii.cch = strlen(title);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4094
238 13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4095 InsertMenuItem(mymenu, 65535, TRUE, &mii);
466 c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	4096
506 f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	4097 if(!IS_WINNTOR95)
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	4098 {
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	4099 sprintf(buffer, "_dw_id%d", id);
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	4100 dw_window_set_data(DW_HWND_OBJECT, buffer, (void *)mymenu);
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	4101
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	4102 /* According to the docs this will only work on Win2k/98 and above */
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	4103 if(submenu)
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	4104 {
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	4105 MENUINFO mi;
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	4106
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	4107 mi.cbSize = sizeof(MENUINFO);
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	4108 mi.fMask = MIM_MENUDATA;
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	4109 mi.dwMenuData = (ULONG_PTR)mymenu;
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	4110
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	4111 MySetMenuInfo((HMENU)submenu, &mi);
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	4112 }
f1998a89a4d5 Load the Win2K/98 functions dynamically so the same DW.DLL binary will bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 505 diff changeset	4113 }
466 c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	4114
238 13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4115 if(IsWindow(menux) && !IsMenu((HMENU)menux))
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4116 DrawMenuBar(menux);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4117 return (HWND)id;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4118 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4119
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4120 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4121 * Sets the state of a menu item check.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4122 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4123 * menu: The handle the the existing menu.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4124 * id: Menuitem id.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4125 * check: TRUE for checked FALSE for not checked.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4126 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4127 void API dw_menu_item_set_check(HMENUI menux, unsigned long id, int check)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4128 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4129 MENUITEMINFO mii;
238 13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4130 HMENU mymenu = (HMENU)menux;
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4131
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4132 if(IsWindow(menux) && !IsMenu(mymenu))
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4133 mymenu = (HMENU)dw_window_get_data(menux, "_dw_menu");
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4134
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4135 mii.cbSize = sizeof(MENUITEMINFO);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4136 mii.fMask = MIIM_STATE;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4137 if(check)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4138 mii.fState = MFS_CHECKED;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4139 else
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4140 mii.fState = MFS_UNCHECKED;
238 13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4141 SetMenuItemInfo(mymenu, id, FALSE, &mii);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4142 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4143
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4144 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4145 * Pops up a context menu at given x and y coordinates.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4146 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4147 * menu: The handle the the existing menu.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4148 * parent: Handle to the window initiating the popup.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4149 * x: X coordinate.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4150 * y: Y coordinate.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4151 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4152 void API dw_menu_popup(HMENUI *menu, HWND parent, int x, int y)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4153 {
185 f55677513954 Updated the menu code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 182 diff changeset	4154 if(menu)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4155 {
238 13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4156 HMENU mymenu = (HMENU)*menu;
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4157
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4158 if(IsWindow(*menu) && !IsMenu(mymenu))
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4159 mymenu = (HMENU)dw_window_get_data(*menu, "_dw_menu");
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4160
93 98cce029a611 Changed handling of menu item click events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 90 diff changeset	4161 popup = parent;
238 13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4162 TrackPopupMenu(mymenu, 0, x, y, 0, parent, NULL);
467 ecf1df2edcee Cleanup code needs to delayed by posting to the window procedure so that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 466 diff changeset	4163 PostMessage(DW_HWND_OBJECT, WM_USER+5, (LPARAM)mymenu, 0);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4164 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4165 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4166
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4167
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4168 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4169 * Create a container object to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4170 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4171 * id: An ID to be used for getting the resource from the
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4172 * resource file.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4173 */
350 2216e65ad2ae Removed slider flags and container selection flags from the header file. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 346 diff changeset	4174 HWND API dw_container_new(ULONG id, int multi)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4175 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4176 HWND tmp = CreateWindow(WC_LISTVIEW,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4177 "",
107 cd0e5cf92f6a Rewrote the Windows packing code so it is more like OS/2 to improve window bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 106 diff changeset	4178 WS_VISIBLE \| WS_CHILD \|
350 2216e65ad2ae Removed slider flags and container selection flags from the header file. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 346 diff changeset	4179 (multi ? 0 : LVS_SINGLESEL) \|
107 cd0e5cf92f6a Rewrote the Windows packing code so it is more like OS/2 to improve window bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 106 diff changeset	4180 LVS_REPORT \| LVS_SHOWSELALWAYS \|
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4181 LVS_SHAREIMAGELISTS \| WS_BORDER \|
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4182 WS_CLIPCHILDREN,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4183 0,0,2000,1000,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4184 DW_HWND_OBJECT,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4185 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	4186 DWInstance,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4187 NULL);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4188 ContainerInfo cinfo = (ContainerInfo )calloc(1, sizeof(ContainerInfo));
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4189
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4190 if(!cinfo)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4191 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4192 DestroyWindow(tmp);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4193 return NULL;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4194 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4195
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4196 cinfo->pOldProc = (WNDPROC)SubclassWindow(tmp, _containerwndproc);
68 8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4197 cinfo->cinfo.fore = cinfo->cinfo.back = -1;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4198
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	4199 SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)cinfo);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4200 dw_window_set_font(tmp, DefaultFont);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4201 return tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4202 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4203
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4204 /*
22 6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	4205 * Create a tree object to be packed.
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	4206 * Parameters:
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	4207 * id: An ID to be used for getting the resource from the
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	4208 * resource file.
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	4209 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4210 HWND API dw_tree_new(ULONG id)
22 6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	4211 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4212 HWND tmp = CreateWindow(WC_TREEVIEW,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4213 "",
107 cd0e5cf92f6a Rewrote the Windows packing code so it is more like OS/2 to improve window bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 106 diff changeset	4214 WS_VISIBLE \| WS_CHILD \|
cd0e5cf92f6a Rewrote the Windows packing code so it is more like OS/2 to improve window bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 106 diff changeset	4215 TVS_HASLINES \| TVS_SHOWSELALWAYS \|
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4216 TVS_HASBUTTONS \| TVS_LINESATROOT \|
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4217 WS_BORDER \| WS_CLIPCHILDREN,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4218 0,0,2000,1000,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4219 DW_HWND_OBJECT,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4220 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	4221 DWInstance,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4222 NULL);
68 8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4223 ContainerInfo cinfo = (ContainerInfo )calloc(1, sizeof(ContainerInfo));
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4224 TreeView_SetItemHeight(tmp, 16);
68 8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4225
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4226 if(!cinfo)
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4227 {
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4228 DestroyWindow(tmp);
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4229 return NULL;
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4230 }
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4231
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4232 cinfo->pOldProc = (WNDPROC)SubclassWindow(tmp, _treewndproc);
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4233 cinfo->cinfo.fore = cinfo->cinfo.back = -1;
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4234
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	4235 SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)cinfo);
22 6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	4236 dw_window_set_font(tmp, DefaultFont);
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	4237 return tmp;
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	4238 }
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	4239
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	4240 /*
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4241 * Returns the current X and Y coordinates of the mouse pointer.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4242 * Parameters:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4243 * x: Pointer to variable to store X coordinate.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4244 * y: Pointer to variable to store Y coordinate.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4245 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4246 void API dw_pointer_query_pos(long x, long y)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4247 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4248 POINT ptl;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4249
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4250 GetCursorPos(&ptl);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4251 if(x && y)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4252 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4253 *x = ptl.x;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4254 *y = ptl.y;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4255 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4256 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4257
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4258 /*
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4259 * Sets the X and Y coordinates of the mouse pointer.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4260 * Parameters:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4261 * x: X coordinate.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4262 * y: Y coordinate.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4263 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4264 void API dw_pointer_set_pos(long x, long y)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4265 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4266 SetCursorPos(x, y);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4267 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4268
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4269 /*
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4270 * Create a new static text window (widget) to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4271 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4272 * text: The text to be display by the static text widget.
278 df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4273 * id: An ID to be used with dw_window_from_id() or 0L.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4274 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4275 HWND API dw_text_new(char *text, ULONG id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4276 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4277 HWND tmp = CreateWindow(STATICCLASSNAME,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4278 text,
107 cd0e5cf92f6a Rewrote the Windows packing code so it is more like OS/2 to improve window bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 106 diff changeset	4279 BS_TEXT \| WS_VISIBLE \|
cd0e5cf92f6a Rewrote the Windows packing code so it is more like OS/2 to improve window bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 106 diff changeset	4280 WS_CHILD \| WS_CLIPCHILDREN,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4281 0,0,2000,1000,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4282 DW_HWND_OBJECT,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4283 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	4284 DWInstance,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4285 NULL);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4286 dw_window_set_font(tmp, DefaultFont);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4287 return tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4288 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4289
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4290 /*
7 005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	4291 * Create a new status text window (widget) to be packed.
005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	4292 * Parameters:
005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	4293 * text: The text to be display by the static text widget.
278 df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4294 * id: An ID to be used with dw_window_from_id() or 0L.
7 005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	4295 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4296 HWND API dw_status_text_new(char *text, ULONG id)
7 005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	4297 {
299 2a97f8d9b297 Use DrawStatusText() to make the status lines, instead of doing it ourself. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 298 diff changeset	4298 HWND tmp = CreateWindow(ObjectClassName,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4299 text,
107 cd0e5cf92f6a Rewrote the Windows packing code so it is more like OS/2 to improve window bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 106 diff changeset	4300 BS_TEXT \| WS_VISIBLE \|
cd0e5cf92f6a Rewrote the Windows packing code so it is more like OS/2 to improve window bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 106 diff changeset	4301 WS_CHILD \| WS_CLIPCHILDREN,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4302 0,0,2000,1000,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4303 DW_HWND_OBJECT,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4304 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	4305 DWInstance,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4306 NULL);
7 005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	4307 dw_window_set_font(tmp, DefaultFont);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4308 SubclassWindow(tmp, _statuswndproc);
7 005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	4309 return tmp;
005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	4310 }
005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	4311
005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	4312 /*
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4313 * Create a new Multiline Editbox window (widget) to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4314 * Parameters:
278 df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4315 * id: An ID to be used with dw_window_from_id() or 0L.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4316 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4317 HWND API dw_mle_new(ULONG id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4318 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4319
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4320 HWND tmp = CreateWindowEx(WS_EX_CLIENTEDGE,
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4321 EDITCLASSNAME,
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4322 "",
107 cd0e5cf92f6a Rewrote the Windows packing code so it is more like OS/2 to improve window bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 106 diff changeset	4323 WS_VISIBLE \| WS_BORDER \|
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4324 WS_VSCROLL \| ES_MULTILINE \|
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4325 ES_WANTRETURN \| WS_CHILD \|
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4326 WS_CLIPCHILDREN,
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4327 0,0,2000,1000,
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4328 DW_HWND_OBJECT,
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4329 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	4330 DWInstance,
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4331 NULL);
68 8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4332 ContainerInfo cinfo = (ContainerInfo )calloc(1, sizeof(ContainerInfo));
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4333
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4334 if(!cinfo)
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4335 {
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4336 DestroyWindow(tmp);
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4337 return NULL;
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4338 }
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4339
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4340 cinfo->pOldProc = (WNDPROC)SubclassWindow(tmp, _treewndproc);
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4341 cinfo->cinfo.fore = cinfo->cinfo.back = -1;
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4342
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	4343 SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)cinfo);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4344 dw_window_set_font(tmp, DefaultFont);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4345 return tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4346 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4347
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4348 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4349 * Create a new Entryfield window (widget) to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4350 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4351 * text: The default text to be in the entryfield widget.
278 df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4352 * id: An ID to be used with dw_window_from_id() or 0L.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4353 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4354 HWND API dw_entryfield_new(char *text, ULONG id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4355 {
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4356 HWND tmp = CreateWindowEx(WS_EX_CLIENTEDGE,
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4357 EDITCLASSNAME,
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4358 text,
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4359 ES_WANTRETURN \| WS_CHILD \|
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4360 WS_BORDER \| ES_AUTOHSCROLL \|
107 cd0e5cf92f6a Rewrote the Windows packing code so it is more like OS/2 to improve window bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 106 diff changeset	4361 WS_VISIBLE \| WS_CLIPCHILDREN,
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4362 0,0,2000,1000,
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4363 DW_HWND_OBJECT,
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4364 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	4365 DWInstance,
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4366 NULL);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4367 ColorInfo *cinfo = calloc(1, sizeof(ColorInfo));
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4368
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4369 cinfo->back = cinfo->fore = -1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4370
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4371 cinfo->pOldProc = SubclassWindow(tmp, _colorwndproc);
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	4372 SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)cinfo);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4373 dw_window_set_font(tmp, DefaultFont);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4374 return tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4375 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4376
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4377 /*
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4378 * Create a new Entryfield passwird window (widget) to be packed.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4379 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4380 * text: The default text to be in the entryfield widget.
278 df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4381 * id: An ID to be used with dw_window_from_id() or 0L.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4382 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4383 HWND API dw_entryfield_password_new(char *text, ULONG id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4384 {
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4385 HWND tmp = CreateWindowEx(WS_EX_CLIENTEDGE,
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4386 EDITCLASSNAME,
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4387 text,
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4388 ES_WANTRETURN \| WS_CHILD \|
107 cd0e5cf92f6a Rewrote the Windows packing code so it is more like OS/2 to improve window bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 106 diff changeset	4389 ES_PASSWORD \| WS_BORDER \| WS_VISIBLE \|
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4390 ES_AUTOHSCROLL \| WS_CLIPCHILDREN,
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4391 0,0,2000,1000,
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4392 DW_HWND_OBJECT,
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4393 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	4394 DWInstance,
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4395 NULL);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4396 ColorInfo *cinfo = calloc(1, sizeof(ColorInfo));
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4397
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4398 cinfo->back = cinfo->fore = -1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4399
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4400 cinfo->pOldProc = SubclassWindow(tmp, _colorwndproc);
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	4401 SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)cinfo);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4402 dw_window_set_font(tmp, DefaultFont);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4403 return tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4404 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4405
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4406 BOOL CALLBACK _subclass_child(HWND handle, LPARAM lp)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4407 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4408 ColorInfo cinfo = (ColorInfo )lp;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4409
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4410 if(cinfo)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4411 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4412 cinfo->buddy = handle;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4413 cinfo->pOldProc = (WNDPROC)SubclassWindow(handle, _colorwndproc);
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	4414 SetWindowLongPtr(handle, GWLP_USERDATA, (LONG_PTR)cinfo);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4415 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4416 return FALSE;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4417 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4418
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4419 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4420 * Create a new Combobox window (widget) to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4421 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4422 * text: The default text to be in the combpbox widget.
278 df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4423 * id: An ID to be used with dw_window_from_id() or 0L.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4424 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4425 HWND API dw_combobox_new(char *text, ULONG id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4426 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4427 HWND tmp = CreateWindow(COMBOBOXCLASSNAME,
89 ec311fe773da Include a vertical scrollbar on comboboxes when there are too many items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 88 diff changeset	4428 text,
ec311fe773da Include a vertical scrollbar on comboboxes when there are too many items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 88 diff changeset	4429 WS_CHILD \| CBS_DROPDOWN \| WS_VSCROLL \|
194 37bee5b50bcb Comboboxes need the CBS_AUTOHSCROLL style on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 191 diff changeset	4430 WS_CLIPCHILDREN \| CBS_AUTOHSCROLL \| WS_VISIBLE,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4431 0,0,2000,1000,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4432 DW_HWND_OBJECT,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4433 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	4434 DWInstance,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4435 NULL);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4436 ColorInfo cinfo = (ColorInfo )calloc(1, sizeof(ColorInfo));
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4437 ColorInfo cinfo2 = (ColorInfo )calloc(1, sizeof(ColorInfo));
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4438
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	4439 if(!cinfo \|\| !cinfo2)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4440 {
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	4441 if(cinfo)
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	4442 free(cinfo);
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	4443 if(cinfo2)
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	4444 free(cinfo2);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4445 DestroyWindow(tmp);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4446 return NULL;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4447 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4448
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4449 cinfo2->fore = cinfo->fore = -1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4450 cinfo2->back = cinfo->back = -1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4451 cinfo2->combo = cinfo->combo = tmp;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4452 EnumChildWindows(tmp, _subclass_child, (LPARAM)cinfo2);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4453
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	4454 SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)cinfo);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4455 dw_window_set_font(tmp, DefaultFont);
449 787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	4456 SetWindowText(tmp, text);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4457 return tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4458 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4459
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4460 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4461 * Create a new button window (widget) to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4462 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4463 * text: The text to be display by the static text widget.
278 df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4464 * id: An ID to be used with dw_window_from_id() or 0L.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4465 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4466 HWND API dw_button_new(char *text, ULONG id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4467 {
60 61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	4468 BubbleButton *bubble = calloc(1, sizeof(BubbleButton));
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4469
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4470 HWND tmp = CreateWindow(BUTTONCLASSNAME,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4471 text,
107 cd0e5cf92f6a Rewrote the Windows packing code so it is more like OS/2 to improve window bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 106 diff changeset	4472 WS_CHILD \| BS_PUSHBUTTON \|
cd0e5cf92f6a Rewrote the Windows packing code so it is more like OS/2 to improve window bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 106 diff changeset	4473 WS_VISIBLE \| WS_CLIPCHILDREN,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4474 0,0,2000,1000,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4475 DW_HWND_OBJECT,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4476 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	4477 DWInstance,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4478 NULL);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4479
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4480 bubble->id = id;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4481 bubble->bubbletext[0] = '\0';
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4482 bubble->pOldProc = (WNDPROC)SubclassWindow(tmp, _BtProc);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4483
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	4484 SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)bubble);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4485 dw_window_set_font(tmp, DefaultFont);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4486 return tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4487 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4488
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4489 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4490 * Create a new bitmap button window (widget) to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4491 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4492 * text: Bubble help text to be displayed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4493 * id: An ID of a bitmap in the resource file.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4494 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4495 HWND API dw_bitmapbutton_new(char *text, ULONG id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4496 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4497 HWND tmp;
60 61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	4498 BubbleButton *bubble = calloc(1, sizeof(BubbleButton));
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4499 HBITMAP hbitmap = LoadBitmap(DWInstance, MAKEINTRESOURCE(id));
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4500
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4501 tmp = CreateWindow(BUTTONCLASSNAME,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4502 "",
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4503 WS_CHILD \| BS_PUSHBUTTON \|
107 cd0e5cf92f6a Rewrote the Windows packing code so it is more like OS/2 to improve window bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 106 diff changeset	4504 BS_BITMAP \| WS_CLIPCHILDREN \|
cd0e5cf92f6a Rewrote the Windows packing code so it is more like OS/2 to improve window bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 106 diff changeset	4505 WS_VISIBLE,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4506 0,0,2000,1000,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4507 DW_HWND_OBJECT,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4508 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	4509 DWInstance,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4510 NULL);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4511
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4512 bubble->id = id;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4513 strncpy(bubble->bubbletext, text, BUBBLE_HELP_MAX - 1);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4514 bubble->bubbletext[BUBBLE_HELP_MAX - 1] = '\0';
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4515 bubble->pOldProc = (WNDPROC)SubclassWindow(tmp, _BtProc);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4516
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	4517 SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)bubble);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4518
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4519 SendMessage(tmp, BM_SETIMAGE,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4520 (WPARAM) IMAGE_BITMAP,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4521 (LPARAM) hbitmap);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4522 return tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4523 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4524
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4525 /*
281 2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4526 * Create a new bitmap button window (widget) to be packed from a file.
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4527 * Parameters:
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4528 * text: Bubble help text to be displayed.
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4529 * id: An ID to be used with dw_window_from_id() or 0L.
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4530 * filename: Name of the file, omit extention to have
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4531 * DW pick the appropriate file extension.
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4532 * (BMP on OS/2 or Windows, XPM on Unix)
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4533 */
507 c607eb385e58 Added missing calling conventions. Thanks Bastian for pointing this out. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 506 diff changeset	4534 HWND API dw_bitmapbutton_new_from_file(char text, unsigned long id, char filename)
281 2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4535 {
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4536 HWND tmp;
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4537 BubbleButton *bubble;
303 464b5e46b313 Create the bitmap button even if the bitmap file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 301 diff changeset	4538 HBITMAP hbitmap = 0;
281 2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4539 char *file = malloc(strlen(filename) + 5);
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4540
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4541 if(!file \|\| !(bubble = calloc(1, sizeof(BubbleButton))))
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4542 {
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4543 if(file)
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4544 free(file);
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4545 return 0;
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4546 }
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4547
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4548 tmp = CreateWindow(BUTTONCLASSNAME,
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4549 "",
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4550 WS_CHILD \| BS_PUSHBUTTON \|
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4551 BS_BITMAP \| WS_CLIPCHILDREN \|
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4552 WS_VISIBLE,
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4553 0,0,2000,1000,
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4554 DW_HWND_OBJECT,
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4555 (HMENU)id,
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4556 DWInstance,
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4557 NULL);
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4558
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4559 bubble->id = id;
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4560 strncpy(bubble->bubbletext, text, BUBBLE_HELP_MAX - 1);
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4561 bubble->bubbletext[BUBBLE_HELP_MAX - 1] = '\0';
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4562 bubble->pOldProc = (WNDPROC)SubclassWindow(tmp, _BtProc);
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4563
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	4564 SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)bubble);
281 2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4565
303 464b5e46b313 Create the bitmap button even if the bitmap file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 301 diff changeset	4566 strcpy(file, filename);
464b5e46b313 Create the bitmap button even if the bitmap file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 301 diff changeset	4567
464b5e46b313 Create the bitmap button even if the bitmap file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 301 diff changeset	4568 /* check if we can read from this file (it exists and read permission) */
464b5e46b313 Create the bitmap button even if the bitmap file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 301 diff changeset	4569 if(access(file, 04) == 0)
464b5e46b313 Create the bitmap button even if the bitmap file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 301 diff changeset	4570 hbitmap = (HBITMAP)LoadImage(NULL, file, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE);
464b5e46b313 Create the bitmap button even if the bitmap file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 301 diff changeset	4571 else
464b5e46b313 Create the bitmap button even if the bitmap file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 301 diff changeset	4572 {
464b5e46b313 Create the bitmap button even if the bitmap file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 301 diff changeset	4573 /* Try with .bmp extention */
464b5e46b313 Create the bitmap button even if the bitmap file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 301 diff changeset	4574 strcat(file, ".bmp");
464b5e46b313 Create the bitmap button even if the bitmap file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 301 diff changeset	4575 if(access(file, 04) == 0)
464b5e46b313 Create the bitmap button even if the bitmap file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 301 diff changeset	4576 hbitmap = (HBITMAP)LoadImage(NULL, file, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE);
464b5e46b313 Create the bitmap button even if the bitmap file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 301 diff changeset	4577 }
464b5e46b313 Create the bitmap button even if the bitmap file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 301 diff changeset	4578
464b5e46b313 Create the bitmap button even if the bitmap file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 301 diff changeset	4579
464b5e46b313 Create the bitmap button even if the bitmap file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 301 diff changeset	4580 if(hbitmap)
464b5e46b313 Create the bitmap button even if the bitmap file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 301 diff changeset	4581 SendMessage(tmp, BM_SETIMAGE,
464b5e46b313 Create the bitmap button even if the bitmap file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 301 diff changeset	4582 (WPARAM) IMAGE_BITMAP,
464b5e46b313 Create the bitmap button even if the bitmap file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 301 diff changeset	4583 (LPARAM) hbitmap);
281 2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4584 free(file);
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4585 return tmp;
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4586 }
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4587
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4588 /*
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4589 * Create a new spinbutton window (widget) to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4590 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4591 * text: The text to be display by the static text widget.
278 df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4592 * id: An ID to be used with dw_window_from_id() or 0L.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4593 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4594 HWND API dw_spinbutton_new(char *text, ULONG id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4595 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4596 ULONG *data = malloc(sizeof(ULONG));
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4597 HWND buddy = CreateWindowEx(WS_EX_CLIENTEDGE,
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4598 EDITCLASSNAME,
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4599 text,
107 cd0e5cf92f6a Rewrote the Windows packing code so it is more like OS/2 to improve window bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 106 diff changeset	4600 WS_CHILD \| WS_BORDER \| WS_VISIBLE \|
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4601 ES_NUMBER \| WS_CLIPCHILDREN,
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4602 0,0,2000,1000,
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4603 DW_HWND_OBJECT,
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4604 NULL,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	4605 DWInstance,
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4606 NULL);
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4607 HWND tmp = CreateWindowEx(WS_EX_CLIENTEDGE,
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4608 UPDOWN_CLASS,
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4609 NULL,
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4610 WS_CHILD \| UDS_ALIGNRIGHT \| WS_BORDER \|
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4611 UDS_ARROWKEYS \| UDS_SETBUDDYINT \|
107 cd0e5cf92f6a Rewrote the Windows packing code so it is more like OS/2 to improve window bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 106 diff changeset	4612 UDS_WRAP \| UDS_NOTHOUSANDS \| WS_VISIBLE,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4613 0,0,2000,1000,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4614 DW_HWND_OBJECT,
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4615 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	4616 DWInstance,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4617 NULL);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4618 ColorInfo *cinfo = calloc(1, sizeof(ColorInfo));
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4619
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4620 SendMessage(tmp, UDM_SETBUDDY, (WPARAM)buddy, 0);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4621 cinfo->back = cinfo->fore = -1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4622 cinfo->buddy = tmp;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4623
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4624 cinfo->pOldProc = SubclassWindow(buddy, _colorwndproc);
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	4625 SetWindowLongPtr(buddy, GWLP_USERDATA, (LONG_PTR)cinfo);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4626
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4627 cinfo = calloc(1, sizeof(ColorInfo));
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4628 cinfo->buddy = buddy;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4629 cinfo->pOldProc = SubclassWindow(tmp, _spinnerwndproc);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4630
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	4631 SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)cinfo);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4632 dw_window_set_font(buddy, DefaultFont);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4633 return tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4634 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4635
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4636 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4637 * Create a new radiobutton window (widget) to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4638 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4639 * text: The text to be display by the static text widget.
278 df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4640 * id: An ID to be used with dw_window_from_id() or 0L.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4641 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4642 HWND API dw_radiobutton_new(char *text, ULONG id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4643 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4644 HWND tmp = CreateWindow(BUTTONCLASSNAME,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4645 text,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4646 WS_CHILD \| BS_AUTORADIOBUTTON \|
107 cd0e5cf92f6a Rewrote the Windows packing code so it is more like OS/2 to improve window bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 106 diff changeset	4647 WS_CLIPCHILDREN \| WS_VISIBLE,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4648 0,0,2000,1000,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4649 DW_HWND_OBJECT,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4650 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	4651 DWInstance,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4652 NULL);
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4653 BubbleButton *bubble = calloc(1, sizeof(BubbleButton));
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4654 bubble->id = id;
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4655 bubble->pOldProc = (WNDPROC)SubclassWindow(tmp, _BtProc);
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4656 bubble->cinfo.fore = -1;
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4657 bubble->cinfo.back = -1;
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	4658 SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)bubble);
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4659 dw_window_set_font(tmp, DefaultFont);
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4660 return tmp;
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4661 }
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4662
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4663
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4664 /*
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4665 * Create a new slider window (widget) to be packed.
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4666 * Parameters:
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4667 * vertical: TRUE or FALSE if slider is vertical.
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4668 * increments: Number of increments available.
278 df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4669 * id: An ID to be used with dw_window_from_id() or 0L.
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4670 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4671 HWND API dw_slider_new(int vertical, int increments, ULONG id)
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4672 {
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4673 HWND tmp = CreateWindow(TRACKBAR_CLASS,
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4674 "",
107 cd0e5cf92f6a Rewrote the Windows packing code so it is more like OS/2 to improve window bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 106 diff changeset	4675 WS_CHILD \| WS_CLIPCHILDREN \| WS_VISIBLE \|
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4676 (vertical ? TBS_VERT : TBS_HORZ),
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4677 0,0,2000,1000,
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4678 DW_HWND_OBJECT,
119 1cad81b7cc4c Implemented initial splitbar code on Unix. And made some fixes for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 118 diff changeset	4679 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	4680 DWInstance,
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4681 NULL);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4682 ColorInfo *cinfo = calloc(1, sizeof(ColorInfo));
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4683
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4684 cinfo->back = cinfo->fore = -1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4685
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4686 cinfo->pOldProc = SubclassWindow(tmp, _colorwndproc);
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	4687 SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)cinfo);
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4688 SendMessage(tmp, TBM_SETRANGE, (WPARAM)FALSE, (LPARAM)MAKELONG(0, increments-1));
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4689 return tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4690 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4691
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4692 /*
197 f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	4693 * Create a new scrollbar window (widget) to be packed.
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	4694 * Parameters:
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	4695 * vertical: TRUE or FALSE if scrollbar is vertical.
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	4696 * increments: Number of increments available.
278 df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4697 * id: An ID to be used with dw_window_from_id() or 0L.
197 f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	4698 */
511 80dbd5a1f403 Removed the increments parameter from dw_scrollbar_new(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 510 diff changeset	4699 HWND API dw_scrollbar_new(int vertical, ULONG id)
197 f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	4700 {
204 098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	4701 HWND tmp = CreateWindow(SCROLLBARCLASSNAME,
197 f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	4702 "",
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	4703 WS_CHILD \| WS_CLIPCHILDREN \| WS_VISIBLE \|
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	4704 (vertical ? SBS_VERT : SBS_HORZ),
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	4705 0,0,2000,1000,
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	4706 DW_HWND_OBJECT,
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	4707 (HMENU)id,
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	4708 DWInstance,
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	4709 NULL);
204 098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	4710 ColorInfo *cinfo = calloc(1, sizeof(ColorInfo));
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	4711
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	4712 cinfo->back = cinfo->fore = -1;
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	4713
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	4714 cinfo->pOldProc = SubclassWindow(tmp, _colorwndproc);
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	4715 SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)cinfo);
204 098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	4716 dw_window_set_data(tmp, "_dw_scrollbar", (void *)1);
197 f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	4717 return tmp;
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	4718 }
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	4719
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	4720 /*
33 72675de7d229 Renamed slider class to percent class. Implemented my own percent widget bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 32 diff changeset	4721 * Create a new percent bar window (widget) to be packed.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4722 * Parameters:
278 df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4723 * id: An ID to be used with dw_window_from_id() or 0L.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4724 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4725 HWND API dw_percent_new(ULONG id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4726 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4727 return CreateWindow(PROGRESS_CLASS,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4728 "",
107 cd0e5cf92f6a Rewrote the Windows packing code so it is more like OS/2 to improve window bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 106 diff changeset	4729 WS_VISIBLE \| WS_CHILD \| WS_CLIPCHILDREN,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4730 0,0,2000,1000,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4731 DW_HWND_OBJECT,
119 1cad81b7cc4c Implemented initial splitbar code on Unix. And made some fixes for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 118 diff changeset	4732 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	4733 DWInstance,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4734 NULL);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4735 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4736
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4737 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4738 * Create a new checkbox window (widget) to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4739 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4740 * text: The text to be display by the static text widget.
278 df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4741 * id: An ID to be used with dw_window_from_id() or 0L.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4742 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4743 HWND API dw_checkbox_new(char *text, ULONG id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4744 {
60 61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	4745 BubbleButton *bubble = calloc(1, sizeof(BubbleButton));
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4746 HWND tmp = CreateWindow(BUTTONCLASSNAME,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4747 text,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4748 WS_CHILD \| BS_AUTOCHECKBOX \|
107 cd0e5cf92f6a Rewrote the Windows packing code so it is more like OS/2 to improve window bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 106 diff changeset	4749 BS_TEXT \| WS_CLIPCHILDREN \| WS_VISIBLE,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4750 0,0,2000,1000,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4751 DW_HWND_OBJECT,
119 1cad81b7cc4c Implemented initial splitbar code on Unix. And made some fixes for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 118 diff changeset	4752 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	4753 DWInstance,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4754 NULL);
60 61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	4755 bubble->id = id;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	4756 bubble->checkbox = 1;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	4757 bubble->pOldProc = (WNDPROC)SubclassWindow(tmp, _BtProc);
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	4758 bubble->cinfo.fore = -1;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	4759 bubble->cinfo.back = -1;
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	4760 SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)bubble);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4761 dw_window_set_font(tmp, DefaultFont);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4762 return tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4763 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4764
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4765 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4766 * Create a new listbox window (widget) to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4767 * Parameters:
278 df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4768 * id: An ID to be used with dw_window_from_id() or 0L.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4769 * multi: Multiple select TRUE or FALSE.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4770 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4771 HWND API dw_listbox_new(ULONG id, int multi)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4772 {
155 840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	4773 HWND tmp = CreateWindowEx(WS_EX_CLIENTEDGE,
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	4774 LISTBOXCLASSNAME,
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	4775 "",
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	4776 WS_VISIBLE \| LBS_NOINTEGRALHEIGHT \|
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	4777 WS_CHILD \| LBS_HASSTRINGS \|
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	4778 LBS_NOTIFY \| WS_BORDER \| WS_CLIPCHILDREN \|
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	4779 WS_VSCROLL \| (multi ? LBS_MULTIPLESEL : 0) ,
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	4780 0,0,2000,1000,
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	4781 DW_HWND_OBJECT,
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	4782 (HMENU)id,
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	4783 DWInstance,
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	4784 NULL);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4785 ContainerInfo cinfo = (ContainerInfo )calloc(1, sizeof(ContainerInfo));
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4786
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4787 if(!cinfo)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4788 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4789 DestroyWindow(tmp);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4790 return NULL;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4791 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4792
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4793 cinfo->cinfo.fore = -1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4794 cinfo->cinfo.back = -1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4795 cinfo->pOldProc = (WNDPROC)SubclassWindow(tmp, _containerwndproc);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4796
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	4797 SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)cinfo);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4798 dw_window_set_font(tmp, DefaultFont);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4799 return tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4800 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4801
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4802 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4803 * Sets the icon used for a given window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4804 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4805 * handle: Handle to the window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4806 * id: An ID to be used to specify the icon.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4807 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4808 void API dw_window_set_icon(HWND handle, ULONG id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4809 {
336 a2f72b5d5d0a Minor change to dw_window_set_icon() on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 334 diff changeset	4810 HICON hicon = id < 65536 ? LoadIcon(DWInstance, MAKEINTRESOURCE(id)) : (HICON)id;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4811
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4812 SendMessage(handle, WM_SETICON,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4813 (WPARAM) IMAGE_ICON,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4814 (LPARAM) hicon);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4815 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4816
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4817 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4818 * Sets the bitmap used for a given static window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4819 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4820 * handle: Handle to the window.
278 df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4821 * id: An ID to be used to specify the icon,
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4822 * (pass 0 if you use the filename param)
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4823 * filename: a path to a file (Bitmap on OS/2 or
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4824 * Windows and a pixmap on Unix, pass
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4825 * NULL if you use the id param)
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4826 */
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4827 void API dw_window_set_bitmap(HWND handle, unsigned long id, char *filename)
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4828 {
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4829 HBITMAP hbitmap;
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	4830 HBITMAP oldbitmap = (HBITMAP)SendMessage(handle, STM_GETIMAGE, IMAGE_BITMAP, 0);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4831
278 df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4832 if(id)
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4833 hbitmap = LoadBitmap(DWInstance, MAKEINTRESOURCE(id));
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4834 else if(filename)
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4835 {
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4836 char *file = malloc(strlen(filename) + 5);
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4837
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4838 if (!file)
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4839 return;
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4840
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4841 strcpy(file, filename);
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4842
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4843 /* check if we can read from this file (it exists and read permission) */
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4844 if(access(file, 04) != 0)
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4845 {
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4846 /* Try with .bmp extention */
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4847 strcat(file, ".bmp");
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4848 if(access(file, 04) != 0)
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4849 {
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4850 free(file);
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4851 return;
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4852 }
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4853 }
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4854
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4855 hbitmap = (HBITMAP)LoadImage(NULL, file, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE);
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4856 free(file);
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4857 }
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4858 else
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4859 return;
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4860
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4861 SendMessage(handle, STM_SETIMAGE,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4862 (WPARAM) IMAGE_BITMAP,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4863 (LPARAM) hbitmap);
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	4864
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	4865 if(oldbitmap)
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	4866 DeleteObject(oldbitmap);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4867 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4868
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4869 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4870 * Sets the text used for a given window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4871 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4872 * handle: Handle to the window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4873 * text: The text associsated with a given window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4874 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4875 void API dw_window_set_text(HWND handle, char *text)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4876 {
75 c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	4877 char tmpbuf[100];
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	4878
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	4879 GetClassName(handle, tmpbuf, 99);
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	4880
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4881 SetWindowText(handle, text);
75 c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	4882
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	4883 /* Combobox */
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	4884 if(strnicmp(tmpbuf, COMBOBOXCLASSNAME, strlen(COMBOBOXCLASSNAME)+1)==0)
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	4885 SendMessage(handle, CB_SETEDITSEL, 0, MAKELPARAM(-1, 0));
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4886 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4887
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4888 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4889 * Gets the text used for a given window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4890 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4891 * handle: Handle to the window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4892 * Returns:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4893 * text: The text associsated with a given window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4894 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4895 char * API dw_window_get_text(HWND handle)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4896 {
173 c2b5d0019ec3 Updated dw_window_get_text() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 168 diff changeset	4897 int len = GetWindowTextLength(handle);
c2b5d0019ec3 Updated dw_window_get_text() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 168 diff changeset	4898 char *tempbuf = calloc(1, len + 2);
c2b5d0019ec3 Updated dw_window_get_text() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 168 diff changeset	4899
c2b5d0019ec3 Updated dw_window_get_text() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 168 diff changeset	4900 GetWindowText(handle, tempbuf, len + 1);
c2b5d0019ec3 Updated dw_window_get_text() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 168 diff changeset	4901
c2b5d0019ec3 Updated dw_window_get_text() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 168 diff changeset	4902 return tempbuf;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4903 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4904
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4905 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4906 * Disables given window (widget).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4907 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4908 * handle: Handle to the window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4909 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4910 void API dw_window_disable(HWND handle)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4911 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4912 EnableWindow(handle, FALSE);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4913 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4914
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4915 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4916 * Enables given window (widget).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4917 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4918 * handle: Handle to the window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4919 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4920 void API dw_window_enable(HWND handle)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4921 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4922 EnableWindow(handle, TRUE);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4923 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4924
247 c097ffe6cfeb Implemented dw_window_from_id() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 243 diff changeset	4925 static HWND _dw_wfid_hwnd = NULL;
c097ffe6cfeb Implemented dw_window_from_id() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 243 diff changeset	4926
c097ffe6cfeb Implemented dw_window_from_id() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 243 diff changeset	4927 BOOL CALLBACK _wfid(HWND handle, LPARAM lParam)
c097ffe6cfeb Implemented dw_window_from_id() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 243 diff changeset	4928 {
c097ffe6cfeb Implemented dw_window_from_id() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 243 diff changeset	4929 if(GetWindowLong(handle, GWL_ID) == lParam)
c097ffe6cfeb Implemented dw_window_from_id() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 243 diff changeset	4930 {
c097ffe6cfeb Implemented dw_window_from_id() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 243 diff changeset	4931 _dw_wfid_hwnd = handle;
c097ffe6cfeb Implemented dw_window_from_id() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 243 diff changeset	4932 return FALSE;
c097ffe6cfeb Implemented dw_window_from_id() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 243 diff changeset	4933 }
c097ffe6cfeb Implemented dw_window_from_id() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 243 diff changeset	4934 return TRUE;
c097ffe6cfeb Implemented dw_window_from_id() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 243 diff changeset	4935 }
c097ffe6cfeb Implemented dw_window_from_id() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 243 diff changeset	4936
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4937 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4938 * Gets the child window handle with specified ID.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4939 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4940 * handle: Handle to the parent window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4941 * id: Integer ID of the child.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4942 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4943 HWND API dw_window_from_id(HWND handle, int id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4944 {
247 c097ffe6cfeb Implemented dw_window_from_id() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 243 diff changeset	4945 _dw_wfid_hwnd = NULL;
c097ffe6cfeb Implemented dw_window_from_id() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 243 diff changeset	4946 EnumChildWindows(handle, _wfid, (LPARAM)id);
c097ffe6cfeb Implemented dw_window_from_id() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 243 diff changeset	4947 return _dw_wfid_hwnd;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4948 }
248 0f9a185deeb6 Minor change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 247 diff changeset	4949
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4950 /*
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4951 * Pack windows (widgets) into a box from the start (or top).
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4952 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4953 * box: Window handle of the box to be packed into.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4954 * item: Window handle of the item to be back.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4955 * width: Width in pixels of the item or -1 to be self determined.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4956 * height: Height in pixels of the item or -1 to be self determined.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4957 * hsize: TRUE if the window (widget) should expand horizontally to fill space given.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4958 * vsize: TRUE if the window (widget) should expand vertically to fill space given.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4959 * pad: Number of pixels of padding around the item.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4960 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4961 void API dw_box_pack_start(HWND box, HWND item, int width, int height, int hsize, int vsize, int pad)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4962 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4963 Box *thisbox;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4964
447 5a0779561d0f Add more tests for dw_pac() functions. Throw up a messagebox if you try and mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 444 diff changeset	4965 /*
5a0779561d0f Add more tests for dw_pac() functions. Throw up a messagebox if you try and mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 444 diff changeset	4966 * If you try and pack an item into itself VERY bad things can happen; like at least an
5a0779561d0f Add more tests for dw_pac() functions. Throw up a messagebox if you try and mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 444 diff changeset	4967 * infinite loop on GTK! Lets be safe!
5a0779561d0f Add more tests for dw_pac() functions. Throw up a messagebox if you try and mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 444 diff changeset	4968 */
5a0779561d0f Add more tests for dw_pac() functions. Throw up a messagebox if you try and mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 444 diff changeset	4969 if(box == item)
5a0779561d0f Add more tests for dw_pac() functions. Throw up a messagebox if you try and mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 444 diff changeset	4970 {
526 d3ce0afa6cf5 Remove extraneous arguments to dw_messagebox() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 522 diff changeset	4971 dw_messagebox("dw_box_pack_start()", DW_MB_OK\|DW_MB_ERROR, "Danger! Danger! Will Robinson; box and item are the same!");
447 5a0779561d0f Add more tests for dw_pac() functions. Throw up a messagebox if you try and mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 444 diff changeset	4972 return;
5a0779561d0f Add more tests for dw_pac() functions. Throw up a messagebox if you try and mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 444 diff changeset	4973 }
5a0779561d0f Add more tests for dw_pac() functions. Throw up a messagebox if you try and mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 444 diff changeset	4974
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	4975 thisbox = (Box *)GetWindowLongPtr(box, GWLP_USERDATA);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4976 if(thisbox)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4977 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4978 int z;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4979 Item tmpitem, thisitem = thisbox->items;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4980 char tmpbuf[100];
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4981
14 176cee043f1b Lots of Windows and Unix bug fixes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 12 diff changeset	4982 tmpitem = malloc(sizeof(Item)*(thisbox->count+1));
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4983
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4984 for(z=0;z<thisbox->count;z++)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4985 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4986 tmpitem[z] = thisitem[z];
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4987 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4988
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4989 GetClassName(item, tmpbuf, 99);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4990
298 caed245ea8a1 Sanity check, if expand is set width/height can't be zero... force it to 1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 295 diff changeset	4991 if(vsize && !height)
caed245ea8a1 Sanity check, if expand is set width/height can't be zero... force it to 1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 295 diff changeset	4992 height = 1;
caed245ea8a1 Sanity check, if expand is set width/height can't be zero... force it to 1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 295 diff changeset	4993 if(hsize && !width)
caed245ea8a1 Sanity check, if expand is set width/height can't be zero... force it to 1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 295 diff changeset	4994 width = 1;
caed245ea8a1 Sanity check, if expand is set width/height can't be zero... force it to 1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 295 diff changeset	4995
440 9af47c551a56 Noticed an artifact from the OS/2 port that was incorrect. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 439 diff changeset	4996 if(strnicmp(tmpbuf, FRAMECLASSNAME, strlen(FRAMECLASSNAME)+1)==0)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4997 tmpitem[thisbox->count].type = TYPEBOX;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4998 else
438 fac2afe7bda3 Only throw up the messagebox when expand and size are both 0 and the item bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 436 diff changeset	4999 {
fac2afe7bda3 Only throw up the messagebox when expand and size are both 0 and the item bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 436 diff changeset	5000 if ( width == 0 && hsize == FALSE )
fac2afe7bda3 Only throw up the messagebox when expand and size are both 0 and the item bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 436 diff changeset	5001 dw_messagebox("dw_box_pack_start()", DW_MB_OK\|DW_MB_ERROR, "Width and expand Horizonal both unset for box: %x item: %x",box,item);
fac2afe7bda3 Only throw up the messagebox when expand and size are both 0 and the item bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 436 diff changeset	5002 if ( height == 0 && vsize == FALSE )
fac2afe7bda3 Only throw up the messagebox when expand and size are both 0 and the item bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 436 diff changeset	5003 dw_messagebox("dw_box_pack_start()", DW_MB_OK\|DW_MB_ERROR, "Height and expand Vertical both unset for box: %x item: %x",box,item);
fac2afe7bda3 Only throw up the messagebox when expand and size are both 0 and the item bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 436 diff changeset	5004
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5005 tmpitem[thisbox->count].type = TYPEITEM;
438 fac2afe7bda3 Only throw up the messagebox when expand and size are both 0 and the item bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 436 diff changeset	5006 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5007
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5008 tmpitem[thisbox->count].hwnd = item;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5009 tmpitem[thisbox->count].origwidth = tmpitem[thisbox->count].width = width;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5010 tmpitem[thisbox->count].origheight = tmpitem[thisbox->count].height = height;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5011 tmpitem[thisbox->count].pad = pad;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5012 if(hsize)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5013 tmpitem[thisbox->count].hsize = SIZEEXPAND;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5014 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5015 tmpitem[thisbox->count].hsize = SIZESTATIC;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5016
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5017 if(vsize)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5018 tmpitem[thisbox->count].vsize = SIZEEXPAND;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5019 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5020 tmpitem[thisbox->count].vsize = SIZESTATIC;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5021
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5022 thisbox->items = tmpitem;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5023
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5024 if(thisbox->count)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5025 free(thisitem);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5026
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5027 thisbox->count++;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5028
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5029 SetParent(item, box);
440 9af47c551a56 Noticed an artifact from the OS/2 port that was incorrect. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 439 diff changeset	5030 if(strncmp(tmpbuf, UPDOWN_CLASS, strlen(UPDOWN_CLASS)+1)==0)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5031 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	5032 ColorInfo cinfo = (ColorInfo )GetWindowLongPtr(item, GWLP_USERDATA);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5033
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5034 if(cinfo)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5035 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5036 SetParent(cinfo->buddy, box);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5037 ShowWindow(cinfo->buddy, SW_SHOW);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5038 SendMessage(item, UDM_SETBUDDY, (WPARAM)cinfo->buddy, 0);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5039 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5040 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5041 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5042 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5043
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5044 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5045 * Sets the size of a given window (widget).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5046 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5047 * handle: Window (widget) handle.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5048 * width: New width in pixels.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5049 * height: New height in pixels.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5050 */
510 710f82598210 Change function names to be inline with Mark Hessling's Rexx/DW. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 509 diff changeset	5051 void API dw_window_set_size(HWND handle, ULONG width, ULONG height)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5052 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5053 SetWindowPos(handle, (HWND)NULL, 0, 0, width, height, SWP_SHOWWINDOW \| SWP_NOZORDER \| SWP_NOMOVE);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5054 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5055
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5056 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5057 * Returns the width of the screen.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5058 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5059 int API dw_screen_width(void)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5060 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5061 return GetSystemMetrics(SM_CXSCREEN);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5062 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5063
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5064 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5065 * Returns the height of the screen.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5066 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5067 int API dw_screen_height(void)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5068 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5069 return GetSystemMetrics(SM_CYSCREEN);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5070 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5071
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5072 /* This should return the current color depth */
514 08d770271709 More function name changes for Rexx/DW compatibility. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 513 diff changeset	5073 unsigned long API dw_color_depth_get(void)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5074 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5075 int bpp;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5076 HDC hdc = GetDC(HWND_DESKTOP);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5077
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5078 bpp = GetDeviceCaps(hdc, BITSPIXEL);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5079
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5080 ReleaseDC(HWND_DESKTOP, hdc);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5081
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5082 return bpp;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5083 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5084
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5085
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5086 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5087 * Sets the position of a given window (widget).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5088 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5089 * handle: Window (widget) handle.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5090 * x: X location from the bottom left.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5091 * y: Y location from the bottom left.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5092 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5093 void API dw_window_set_pos(HWND handle, ULONG x, ULONG y)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5094 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5095 SetWindowPos(handle, (HWND)NULL, x, y, 0, 0, SWP_NOSIZE \| SWP_NOZORDER \| SWP_NOACTIVATE);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5096 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5097
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5098 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5099 * Sets the position and size of a given window (widget).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5100 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5101 * handle: Window (widget) handle.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5102 * x: X location from the bottom left.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5103 * y: Y location from the bottom left.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5104 * width: Width of the widget.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5105 * height: Height of the widget.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5106 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5107 void API dw_window_set_pos_size(HWND handle, ULONG x, ULONG y, ULONG width, ULONG height)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5108 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5109 SetWindowPos(handle, (HWND)NULL, x, y, width, height, SWP_NOZORDER \| SWP_SHOWWINDOW \| SWP_NOACTIVATE);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5110 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5111
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5112 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5113 * Gets the position and size of a given window (widget).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5114 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5115 * handle: Window (widget) handle.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5116 * x: X location from the bottom left.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5117 * y: Y location from the bottom left.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5118 * width: Width of the widget.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5119 * height: Height of the widget.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5120 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5121 void API dw_window_get_pos_size(HWND handle, ULONG x, ULONG y, ULONG width, ULONG height)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5122 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5123 WINDOWPLACEMENT wp;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5124
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5125 wp.length = sizeof(WINDOWPLACEMENT);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5126
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5127 GetWindowPlacement(handle, &wp);
473 fc0341624711 Add support for column-click signal. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 469 diff changeset	5128 if( wp.showCmd == SW_SHOWMAXIMIZED)
fc0341624711 Add support for column-click signal. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 469 diff changeset	5129 {
fc0341624711 Add support for column-click signal. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 469 diff changeset	5130 if(x)
fc0341624711 Add support for column-click signal. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 469 diff changeset	5131 *x=0;
fc0341624711 Add support for column-click signal. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 469 diff changeset	5132 if(y)
fc0341624711 Add support for column-click signal. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 469 diff changeset	5133 *y=0;
fc0341624711 Add support for column-click signal. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 469 diff changeset	5134 if(width)
fc0341624711 Add support for column-click signal. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 469 diff changeset	5135 *width=dw_screen_width();
fc0341624711 Add support for column-click signal. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 469 diff changeset	5136 if(height)
fc0341624711 Add support for column-click signal. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 469 diff changeset	5137 *height=dw_screen_height();
fc0341624711 Add support for column-click signal. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 469 diff changeset	5138 }
fc0341624711 Add support for column-click signal. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 469 diff changeset	5139 else
fc0341624711 Add support for column-click signal. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 469 diff changeset	5140 {
fc0341624711 Add support for column-click signal. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 469 diff changeset	5141 if(x)
fc0341624711 Add support for column-click signal. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 469 diff changeset	5142 *x = wp.rcNormalPosition.left;
fc0341624711 Add support for column-click signal. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 469 diff changeset	5143 if(y)
fc0341624711 Add support for column-click signal. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 469 diff changeset	5144 *y = wp.rcNormalPosition.top;
fc0341624711 Add support for column-click signal. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 469 diff changeset	5145 if(width)
fc0341624711 Add support for column-click signal. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 469 diff changeset	5146 *width = wp.rcNormalPosition.right - wp.rcNormalPosition.left;
fc0341624711 Add support for column-click signal. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 469 diff changeset	5147 if(height)
fc0341624711 Add support for column-click signal. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 469 diff changeset	5148 *height = wp.rcNormalPosition.bottom - wp.rcNormalPosition.top;
fc0341624711 Add support for column-click signal. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 469 diff changeset	5149 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5150 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5151
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5152 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5153 * Sets the style of a given window (widget).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5154 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5155 * handle: Window (widget) handle.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5156 * width: New width in pixels.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5157 * height: New height in pixels.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5158 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5159 void API dw_window_set_style(HWND handle, ULONG style, ULONG mask)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5160 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5161 ULONG tmp, currentstyle = GetWindowLong(handle, GWL_STYLE);
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	5162 ColorInfo cinfo = (ColorInfo )GetWindowLongPtr(handle, GWLP_USERDATA);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5163
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5164 tmp = currentstyle \| mask;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5165 tmp ^= mask;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5166 tmp \|= style;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5167
88 58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	5168
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	5169 /* We are using SS_NOPREFIX as a VCENTER flag */
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	5170 if(tmp & SS_NOPREFIX)
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	5171 {
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	5172
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	5173 if(cinfo)
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	5174 cinfo->vcenter = 1;
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	5175 else
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	5176 {
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	5177 cinfo = calloc(1, sizeof(ColorInfo));
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	5178 cinfo->fore = cinfo->back = -1;
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	5179 cinfo->vcenter = 1;
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	5180
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	5181 cinfo->pOldProc = SubclassWindow(handle, _colorwndproc);
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	5182 SetWindowLongPtr(handle, GWLP_USERDATA, (LONG_PTR)cinfo);
88 58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	5183 }
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	5184 }
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	5185 else if(cinfo)
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	5186 cinfo->vcenter = 0;
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	5187
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5188 SetWindowLong(handle, GWL_STYLE, tmp);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5189 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5190
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5191 /* Finds the physical ID from the reference ID */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5192 int _findnotebookid(NotebookPage **array, int pageid)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5193 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5194 int z;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5195
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5196 for(z=0;z<256;z++)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5197 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5198 if(array[z] && array[z]->realid == pageid)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5199 return z;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5200 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5201 return -1;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5202 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5203
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5204 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5205 * Adds a new page to specified notebook.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5206 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5207 * handle: Window (widget) handle.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5208 * flags: Any additional page creation flags.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5209 * front: If TRUE page is added at the beginning.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5210 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5211 unsigned long API dw_notebook_page_new(HWND handle, ULONG flags, int front)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5212 {
191 634625c3239d Fixes for dw_color_xxxx_set() to accept OS/2 style colors, and fixed a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 185 diff changeset	5213 NotebookPage array = (NotebookPage )dw_window_get_data(handle, "_dw_array");
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5214
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5215 if(array)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5216 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5217 int z, refid = -1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5218
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5219 for(z=0;z<256;z++)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5220 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5221 if(_findnotebookid(array, z) == -1)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5222 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5223 refid = z;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5224 break;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5225 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5226 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5227
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5228 if(refid == -1)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5229 return -1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5230
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5231 for(z=0;z<256;z++)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5232 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5233 if(!array[z])
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5234 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5235 int oldpage = TabCtrl_GetCurSel(handle);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5236
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5237 array[z] = calloc(1, sizeof(NotebookPage));
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5238 array[z]->realid = refid;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5239 array[z]->item.mask = TCIF_TEXT;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5240 array[z]->item.iImage = -1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5241 array[z]->item.pszText = "";
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5242 TabCtrl_InsertItem(handle, z, &(array[z]->item));
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5243
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5244 if(oldpage > -1 && array[oldpage])
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5245 SetParent(array[oldpage]->hwnd, DW_HWND_OBJECT);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5246
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5247 TabCtrl_SetCurSel(handle, z);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5248 return refid;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5249 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5250 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5251 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5252 return -1;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5253 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5254
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5255 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5256 * Sets the text on the specified notebook tab.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5257 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5258 * handle: Notebook handle.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5259 * pageid: Page ID of the tab to set.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5260 * text: Pointer to the text to set.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5261 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5262 void API dw_notebook_page_set_text(HWND handle, ULONG pageidx, char *text)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5263 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5264
191 634625c3239d Fixes for dw_color_xxxx_set() to accept OS/2 style colors, and fixed a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 185 diff changeset	5265 NotebookPage array = (NotebookPage )dw_window_get_data(handle, "_dw_array");
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5266 int pageid;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5267
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5268 if(!array)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5269 return;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5270
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5271 pageid = _findnotebookid(array, pageidx);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5272
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5273 if(pageid > -1 && array[pageid])
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5274 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5275 array[pageid]->item.mask = TCIF_TEXT;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5276 array[pageid]->item.pszText = text;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5277 TabCtrl_SetItem(handle, pageid, &(array[pageid]->item));
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5278 _resize_notebook_page(handle, pageid);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5279 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5280 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5281
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5282 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5283 * Sets the text on the specified notebook tab status area.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5284 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5285 * handle: Notebook handle.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5286 * pageid: Page ID of the tab to set.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5287 * text: Pointer to the text to set.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5288 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5289 void API dw_notebook_page_set_status_text(HWND handle, ULONG pageid, char *text)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5290 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5291 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5292
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5293 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5294 * Packs the specified box into the notebook page.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5295 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5296 * handle: Handle to the notebook to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5297 * pageid: Page ID in the notebook which is being packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5298 * page: Box handle to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5299 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5300 void API dw_notebook_pack(HWND handle, ULONG pageidx, HWND page)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5301 {
191 634625c3239d Fixes for dw_color_xxxx_set() to accept OS/2 style colors, and fixed a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 185 diff changeset	5302 NotebookPage array = (NotebookPage )dw_window_get_data(handle, "_dw_array");
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5303 int pageid;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5304
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5305 if(!array)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5306 return;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5307
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5308 pageid = _findnotebookid(array, pageidx);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5309
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5310 if(pageid > -1 && array[pageid])
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5311 {
283 54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	5312 HWND tmpbox = dw_box_new(DW_VERT, 0);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5313
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5314 dw_box_pack_start(tmpbox, page, 0, 0, TRUE, TRUE, 0);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5315 SubclassWindow(tmpbox, _wndproc);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5316 if(array[pageid]->hwnd)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5317 dw_window_destroy(array[pageid]->hwnd);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5318 array[pageid]->hwnd = tmpbox;
510 710f82598210 Change function names to be inline with Mark Hessling's Rexx/DW. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 509 diff changeset	5319 if(pageidx == dw_notebook_page_get(handle))
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5320 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5321 SetParent(tmpbox, handle);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5322 _resize_notebook_page(handle, pageid);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5323 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5324 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5325 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5326
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5327 /*
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5328 * Remove a page from a notebook.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5329 * Parameters:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5330 * handle: Handle to the notebook widget.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5331 * pageid: ID of the page to be destroyed.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5332 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5333 void API dw_notebook_page_destroy(HWND handle, unsigned int pageidx)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5334 {
191 634625c3239d Fixes for dw_color_xxxx_set() to accept OS/2 style colors, and fixed a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 185 diff changeset	5335 NotebookPage array = (NotebookPage )dw_window_get_data(handle, "_dw_array");
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5336 int newid = -1, z, pageid;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5337
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5338 if(!array)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5339 return;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5340
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5341 pageid = _findnotebookid(array, pageidx);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5342
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5343 if(pageid < 0)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5344 return;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5345
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5346 if(array[pageid])
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5347 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5348 SetParent(array[pageid]->hwnd, DW_HWND_OBJECT);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5349 free(array[pageid]);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5350 array[pageid] = NULL;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5351 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5352
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5353 TabCtrl_DeleteItem(handle, pageid);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5354
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5355 /* Shift the pages over 1 */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5356 for(z=pageid;z<255;z++)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5357 array[z] = array[z+1];
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5358 array[255] = NULL;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5359
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5360 for(z=0;z<256;z++)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5361 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5362 if(array[z])
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5363 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5364 newid = z;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5365 break;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5366 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5367 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5368 if(newid > -1)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5369 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5370 SetParent(array[newid]->hwnd, handle);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5371 _resize_notebook_page(handle, newid);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5372 dw_notebook_page_set(handle, array[newid]->realid);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5373 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5374 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5375
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5376 /*
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5377 * Queries the currently visible page ID.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5378 * Parameters:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5379 * handle: Handle to the notebook widget.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5380 */
510 710f82598210 Change function names to be inline with Mark Hessling's Rexx/DW. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 509 diff changeset	5381 unsigned long API dw_notebook_page_get(HWND handle)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5382 {
191 634625c3239d Fixes for dw_color_xxxx_set() to accept OS/2 style colors, and fixed a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 185 diff changeset	5383 NotebookPage array = (NotebookPage )dw_window_get_data(handle, "_dw_array");
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5384 int physid = TabCtrl_GetCurSel(handle);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5385
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5386 if(physid > -1 && physid < 256 && array && array[physid])
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5387 return array[physid]->realid;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5388 return -1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5389 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5390
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5391 /*
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5392 * Sets the currently visible page ID.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5393 * Parameters:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5394 * handle: Handle to the notebook widget.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5395 * pageid: ID of the page to be made visible.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5396 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5397 void API dw_notebook_page_set(HWND handle, unsigned int pageidx)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5398 {
191 634625c3239d Fixes for dw_color_xxxx_set() to accept OS/2 style colors, and fixed a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 185 diff changeset	5399 NotebookPage array = (NotebookPage )dw_window_get_data(handle, "_dw_array");
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5400 int pageid;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5401
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5402 if(!array)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5403 return;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5404
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5405 pageid = _findnotebookid(array, pageidx);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5406
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5407 if(pageid > -1 && pageid < 256)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5408 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5409 int oldpage = TabCtrl_GetCurSel(handle);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5410
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5411 if(oldpage > -1 && array && array[oldpage])
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5412 SetParent(array[oldpage]->hwnd, DW_HWND_OBJECT);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5413
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5414 TabCtrl_SetCurSel(handle, pageid);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5415
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5416 SetParent(array[pageid]->hwnd, handle);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5417 _resize_notebook_page(handle, pageid);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5418 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5419 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5420
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5421 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5422 * Appends the specified text to the listbox's (or combobox) entry list.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5423 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5424 * handle: Handle to the listbox to be appended to.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5425 * text: Text to append into listbox.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5426 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5427 void API dw_listbox_append(HWND handle, char *text)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5428 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5429 char tmpbuf[100];
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5430
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5431 GetClassName(handle, tmpbuf, 99);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5432
371 e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5433 if(strnicmp(tmpbuf, COMBOBOXCLASSNAME, strlen(COMBOBOXCLASSNAME)+1)==0)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5434 SendMessage(handle,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5435 CB_ADDSTRING,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5436 0, (LPARAM)text);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5437 else
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5438 SendMessage(handle,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5439 LB_ADDSTRING,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5440 0, (LPARAM)text);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5441 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5442
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5443 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5444 * Clears the listbox's (or combobox) list of all entries.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5445 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5446 * handle: Handle to the listbox to be cleared.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5447 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5448 void API dw_listbox_clear(HWND handle)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5449 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5450 char tmpbuf[100];
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5451
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5452 GetClassName(handle, tmpbuf, 99);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5453
371 e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5454 if(strnicmp(tmpbuf, COMBOBOXCLASSNAME, strlen(COMBOBOXCLASSNAME)+1)==0)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5455 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5456 char *buf = dw_window_get_text(handle);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5457
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5458 SendMessage(handle,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5459 CB_RESETCONTENT, 0L, 0L);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5460
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5461 if(buf)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5462 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5463 dw_window_set_text(handle, buf);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5464 free(buf);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5465 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5466 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5467 else
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5468 SendMessage(handle,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5469 LB_RESETCONTENT, 0L, 0L);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5470 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5471
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5472 /*
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5473 * Sets the text of a given listbox entry.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5474 * Parameters:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5475 * handle: Handle to the listbox to be queried.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5476 * index: Index into the list to be queried.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5477 * buffer: Buffer where text will be copied.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5478 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5479 void API dw_listbox_set_text(HWND handle, unsigned int index, char *buffer)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5480 {
371 e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5481 char tmpbuf[100];
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5482
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5483 GetClassName(handle, tmpbuf, 99);
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5484
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5485 if(strnicmp(tmpbuf, COMBOBOXCLASSNAME, strlen(COMBOBOXCLASSNAME)+1)==0)
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5486 {
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5487 SendMessage(handle, CB_DELETESTRING, (WPARAM)index, 0);
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5488 SendMessage(handle, CB_INSERTSTRING, (WPARAM)index, (LPARAM)buffer);
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5489 }
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5490 else
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5491 {
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5492 unsigned int sel = (unsigned int)SendMessage(handle, LB_GETCURSEL, 0, 0);
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5493 SendMessage(handle, LB_DELETESTRING, (WPARAM)index, 0);
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5494 SendMessage(handle, LB_INSERTSTRING, (WPARAM)index, (LPARAM)buffer);
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5495 SendMessage(handle, LB_SETCURSEL, (WPARAM)sel, 0);
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5496 SendMessage(handle, LB_SETSEL, (WPARAM)TRUE, (LPARAM)sel);
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5497 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5498 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5499
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5500 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5501 * Copies the given index item's text into buffer.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5502 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5503 * handle: Handle to the listbox to be queried.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5504 * index: Index into the list to be queried.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5505 * buffer: Buffer where text will be copied.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5506 * length: Length of the buffer (including NULL).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5507 */
510 710f82598210 Change function names to be inline with Mark Hessling's Rexx/DW. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 509 diff changeset	5508 void API dw_listbox_get_text(HWND handle, unsigned int index, char *buffer, unsigned int length)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5509 {
351 84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5510 char tmpbuf[100];
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5511 int len;
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5512
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5513 if(!buffer \|\| !length)
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5514 return;
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5515
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5516 buffer[0] = 0;
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5517
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5518 GetClassName(handle, tmpbuf, 99);
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5519
371 e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5520 if(strnicmp(tmpbuf, COMBOBOXCLASSNAME, strlen(COMBOBOXCLASSNAME)+1)==0)
351 84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5521 {
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5522 len = (int)SendMessage(handle, CB_GETLBTEXTLEN, (WPARAM)index, 0);
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5523
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5524 if(len < length && len != CB_ERR)
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5525 SendMessage(handle,
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5526 CB_GETLBTEXT, (WPARAM)index, (LPARAM)buffer);
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5527 }
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5528 else
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5529 {
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5530 len = (int)SendMessage(handle, LB_GETTEXTLEN, (WPARAM)index, 0);
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5531
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5532 if(len < length && len != LB_ERR)
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5533 SendMessage(handle,
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5534 LB_GETTEXT, (WPARAM)index, (LPARAM)buffer);
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5535 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5536 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5537
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5538 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5539 * Returns the index to the item in the list currently selected.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5540 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5541 * handle: Handle to the listbox to be queried.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5542 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5543 unsigned int API dw_listbox_selected(HWND handle)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5544 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5545 char tmpbuf[100];
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5546
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5547 GetClassName(handle, tmpbuf, 99);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5548
371 e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5549 if(strnicmp(tmpbuf, COMBOBOXCLASSNAME, strlen(COMBOBOXCLASSNAME)+1)==0)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5550 return (unsigned int)SendMessage(handle,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5551 CB_GETCURSEL,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5552 0, 0);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5553
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5554 return (unsigned int)SendMessage(handle,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5555 LB_GETCURSEL,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5556 0, 0);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5557 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5558
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5559 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5560 * Returns the index to the current selected item or -1 when done.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5561 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5562 * handle: Handle to the listbox to be queried.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5563 * where: Either the previous return or -1 to restart.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5564 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5565 int API dw_listbox_selected_multi(HWND handle, int where)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5566 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5567 int *array, count, z;
371 e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5568 char tmpbuf[100];
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5569
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5570 GetClassName(handle, tmpbuf, 99);
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5571
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5572 /* This doesn't work on comboboxes */
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5573 if(strnicmp(tmpbuf, COMBOBOXCLASSNAME, strlen(COMBOBOXCLASSNAME)+1)==0)
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5574 return -1;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5575
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5576 count = (int)SendMessage(handle, LB_GETSELCOUNT, 0, 0);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5577 if(count > 0)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5578 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5579 array = malloc(sizeof(int)*count);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5580 SendMessage(handle, LB_GETSELITEMS, (WPARAM)count, (LPARAM)array);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5581
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5582 if(where == -1)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5583 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5584 int ret = array[0];
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5585 free(array);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5586 return ret;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5587 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5588 for(z=0;z<count;z++)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5589 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5590 if(array[z] == where && (z+1) < count)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5591 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5592 int ret = array[z+1];
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5593 free(array);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5594 return ret;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5595 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5596 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5597 free(array);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5598 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5599 return -1;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5600 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5601
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5602 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5603 * Sets the selection state of a given index.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5604 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5605 * handle: Handle to the listbox to be set.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5606 * index: Item index.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5607 * state: TRUE if selected FALSE if unselected.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5608 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5609 void API dw_listbox_select(HWND handle, int index, int state)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5610 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5611 char tmpbuf[100];
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5612
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5613 GetClassName(handle, tmpbuf, 99);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5614
371 e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5615 if(strnicmp(tmpbuf, COMBOBOXCLASSNAME, strlen(COMBOBOXCLASSNAME)+1)==0)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5616 SendMessage(handle, CB_SETCURSEL, (WPARAM)index, 0);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5617 else
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5618 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5619 SendMessage(handle, LB_SETCURSEL, (WPARAM)index, 0);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5620 SendMessage(handle, LB_SETSEL, (WPARAM)state, (LPARAM)index);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5621 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5622 _wndproc(handle, WM_COMMAND, (WPARAM)(LBN_SELCHANGE << 16), (LPARAM)handle);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5623 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5624
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5625 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5626 * Deletes the item with given index from the list.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5627 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5628 * handle: Handle to the listbox to be set.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5629 * index: Item index.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5630 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5631 void API dw_listbox_delete(HWND handle, int index)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5632 {
371 e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5633 char tmpbuf[100];
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5634
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5635 GetClassName(handle, tmpbuf, 99);
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5636
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5637 if(strnicmp(tmpbuf, COMBOBOXCLASSNAME, strlen(COMBOBOXCLASSNAME)+1)==0)
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5638 SendMessage(handle, CB_DELETESTRING, (WPARAM)index, 0);
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5639 else
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5640 SendMessage(handle, LB_DELETESTRING, (WPARAM)index, 0);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5641 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5642
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5643 /*
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5644 * Returns the listbox's item count.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5645 * Parameters:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5646 * handle: Handle to the listbox to be cleared.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5647 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5648 int API dw_listbox_count(HWND handle)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5649 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5650 char tmpbuf[100];
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5651
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5652 GetClassName(handle, tmpbuf, 99);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5653
371 e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5654 if(strnicmp(tmpbuf, COMBOBOXCLASSNAME, strlen(COMBOBOXCLASSNAME)+1)==0)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5655 return (int)SendMessage(handle,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5656 CB_GETCOUNT,0L, 0L);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5657
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5658 return (int)SendMessage(handle,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5659 LB_GETCOUNT,0L, 0L);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5660 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5661
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5662 /*
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5663 * Sets the topmost item in the viewport.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5664 * Parameters:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5665 * handle: Handle to the listbox to be cleared.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5666 * top: Index to the top item.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5667 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5668 void API dw_listbox_set_top(HWND handle, int top)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5669 {
371 e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5670 char tmpbuf[100];
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5671
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5672 GetClassName(handle, tmpbuf, 99);
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5673
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5674 /* This doesn't work on comboboxes */
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5675 if(strnicmp(tmpbuf, COMBOBOXCLASSNAME, strlen(COMBOBOXCLASSNAME)+1)==0)
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5676 return;
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5677
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5678 SendMessage(handle, LB_SETTOPINDEX, (WPARAM)top, 0);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5679 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5680
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5681 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5682 * Adds text to an MLE box and returns the current point.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5683 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5684 * handle: Handle to the MLE to be queried.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5685 * buffer: Text buffer to be imported.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5686 * startpoint: Point to start entering text.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5687 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5688 unsigned int API dw_mle_import(HWND handle, char *buffer, int startpoint)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5689 {
95 636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5690 int textlen, len = GetWindowTextLength(handle);
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5691 char *tmpbuf;
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5692
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5693 if((textlen = strlen(buffer)) < 1)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5694 return startpoint;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5695
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5696 startpoint++;
95 636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5697 tmpbuf = calloc(1, len + textlen + startpoint + 2);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5698
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5699 if(startpoint < 0)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5700 startpoint = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5701
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5702 if(len)
37 360bc6a5f1c9 Sync with latest Dynamic Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 34 diff changeset	5703 {
95 636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5704 char dest, start;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5705 int copylen = len - startpoint;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5706
95 636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5707 GetWindowText(handle, tmpbuf, len+1);
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5708
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5709 dest = &tmpbuf[startpoint+textlen-1];
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5710 start = &tmpbuf[startpoint];
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5711
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5712 if(copylen > 0)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5713 memcpy(dest, start, copylen);
37 360bc6a5f1c9 Sync with latest Dynamic Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 34 diff changeset	5714 }
95 636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5715 memcpy(&tmpbuf[startpoint], buffer, textlen);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5716
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5717 SetWindowText(handle, tmpbuf);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5718
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5719 free(tmpbuf);
95 636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5720 return (startpoint + textlen - 1);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5721 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5722
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5723 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5724 * Grabs text from an MLE box.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5725 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5726 * handle: Handle to the MLE to be queried.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5727 * buffer: Text buffer to be exported.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5728 * startpoint: Point to start grabbing text.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5729 * length: Amount of text to be grabbed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5730 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5731 void API dw_mle_export(HWND handle, char *buffer, int startpoint, int length)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5732 {
95 636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5733 int max, len = GetWindowTextLength(handle);
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5734 char *tmpbuf = calloc(1, len+2);
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5735
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5736 if(len)
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5737 GetWindowText(handle, tmpbuf, len+1);
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5738
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5739 buffer[0] = 0;
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5740
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5741 if(startpoint < len)
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5742 {
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5743 max = MIN(length, len - startpoint);
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5744
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5745 memcpy(buffer, &tmpbuf[startpoint], max);
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5746 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5747
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5748 free(tmpbuf);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5749 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5750
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5751 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5752 * Obtains information about an MLE box.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5753 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5754 * handle: Handle to the MLE to be queried.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5755 * bytes: A pointer to a variable to return the total bytes.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5756 * lines: A pointer to a variable to return the number of lines.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5757 */
510 710f82598210 Change function names to be inline with Mark Hessling's Rexx/DW. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 509 diff changeset	5758 void API dw_mle_get_size(HWND handle, unsigned long bytes, unsigned long lines)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5759 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5760 if(bytes)
95 636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5761 *bytes = GetWindowTextLength(handle);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5762 if(lines)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5763 *lines = (unsigned long)SendMessage(handle, EM_GETLINECOUNT, 0, 0);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5764 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5765
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5766 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5767 * Deletes text from an MLE box.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5768 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5769 * handle: Handle to the MLE to be deleted from.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5770 * startpoint: Point to start deleting text.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5771 * length: Amount of text to be deleted.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5772 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5773 void API dw_mle_delete(HWND handle, int startpoint, int length)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5774 {
95 636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5775 int len = GetWindowTextLength(handle);
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5776 char *tmpbuf = calloc(1, len+2);
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5777
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5778 GetWindowText(handle, tmpbuf, len+1);
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5779
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5780 if(startpoint + length < len)
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5781 {
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5782 strcpy(&tmpbuf[startpoint], &tmpbuf[startpoint+length]);
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5783
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5784 SetWindowText(handle, tmpbuf);
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5785 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5786
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5787 free(tmpbuf);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5788 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5789
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5790 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5791 * Clears all text from an MLE box.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5792 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5793 * handle: Handle to the MLE to be cleared.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5794 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5795 void API dw_mle_clear(HWND handle)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5796 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5797 SetWindowText(handle, "");
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5798 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5799
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5800 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5801 * Sets the visible line of an MLE box.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5802 * Parameters:
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5803 * handle: Handle to the MLE.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5804 * line: Line to be visible.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5805 */
513 7755599311d4 Fixes search and replace errors. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 511 diff changeset	5806 void API dw_mle_set_visible(HWND handle, int line)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5807 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5808 int point = (int)SendMessage(handle, EM_LINEINDEX, (WPARAM)line, 0);
510 710f82598210 Change function names to be inline with Mark Hessling's Rexx/DW. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 509 diff changeset	5809 dw_mle_set_cursor(handle, point);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5810 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5811
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5812 /*
7 005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	5813 * Sets the editablity of an MLE box.
005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	5814 * Parameters:
005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	5815 * handle: Handle to the MLE.
005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	5816 * state: TRUE if it can be edited, FALSE for readonly.
005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	5817 */
513 7755599311d4 Fixes search and replace errors. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 511 diff changeset	5818 void API dw_mle_set_editable(HWND handle, int state)
7 005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	5819 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5820 SendMessage(handle, EM_SETREADONLY, (WPARAM)(state ? FALSE : TRUE), 0);
7 005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	5821 }
005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	5822
005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	5823 /*
005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	5824 * Sets the word wrap state of an MLE box.
005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	5825 * Parameters:
005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	5826 * handle: Handle to the MLE.
005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	5827 * state: TRUE if it wraps, FALSE if it doesn't.
005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	5828 */
513 7755599311d4 Fixes search and replace errors. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 511 diff changeset	5829 void API dw_mle_set_word_wrap(HWND handle, int state)
7 005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	5830 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5831 /* If ES_AUTOHSCROLL is not set and there is not
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5832 * horizontal scrollbar it word wraps.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5833 */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5834 if(state)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5835 dw_window_set_style(handle, 0, ES_AUTOHSCROLL);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5836 else
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5837 dw_window_set_style(handle, ES_AUTOHSCROLL, ES_AUTOHSCROLL);
7 005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	5838 }
005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	5839
005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	5840 /*
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5841 * Sets the current cursor position of an MLE box.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5842 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5843 * handle: Handle to the MLE to be positioned.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5844 * point: Point to position cursor.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5845 */
510 710f82598210 Change function names to be inline with Mark Hessling's Rexx/DW. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 509 diff changeset	5846 void API dw_mle_set_cursor(HWND handle, int point)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5847 {
389 23a603b136bd Change call to SendMessage() to make dw_mle_set() actually work. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 388 diff changeset	5848 SendMessage(handle, EM_SETSEL, 0, MAKELONG(point,point));
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5849 SendMessage(handle, EM_SCROLLCARET, 0, 0);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5850 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5851
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5852 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5853 * Finds text in an MLE box.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5854 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5855 * handle: Handle to the MLE to be cleared.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5856 * text: Text to search for.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5857 * point: Start point of search.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5858 * flags: Search specific flags.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5859 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5860 int API dw_mle_search(HWND handle, char *text, int point, unsigned long flags)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5861 {
95 636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5862 int len = GetWindowTextLength(handle);
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5863 char *tmpbuf = calloc(1, len+2);
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5864 int z, textlen, retval = 0;
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5865
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5866 GetWindowText(handle, tmpbuf, len+1);
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5867
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5868 textlen = strlen(text);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5869
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5870 if(flags & DW_MLE_CASESENSITIVE)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5871 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5872 for(z=point;z<(len-textlen) && !retval;z++)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5873 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5874 if(strncmp(&tmpbuf[z], text, textlen) == 0)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5875 retval = z + textlen;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5876 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5877 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5878 else
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5879 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5880 for(z=point;z<(len-textlen) && !retval;z++)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5881 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5882 if(strnicmp(&tmpbuf[z], text, textlen) == 0)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5883 retval = z + textlen;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5884 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5885 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5886
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5887 if(retval)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5888 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5889 SendMessage(handle, EM_SETSEL, (WPARAM)retval - textlen, (LPARAM)retval);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5890 SendMessage(handle, EM_SCROLLCARET, 0, 0);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5891 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5892
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5893 free(tmpbuf);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5894
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5895 return retval;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5896 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5897
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5898 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5899 * Stops redrawing of an MLE box.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5900 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5901 * handle: Handle to the MLE to freeze.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5902 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5903 void API dw_mle_freeze(HWND handle)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5904 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5905 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5906
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5907 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5908 * Resumes redrawing of an MLE box.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5909 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5910 * handle: Handle to the MLE to thaw.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5911 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5912 void API dw_mle_thaw(HWND handle)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5913 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5914 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5915
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5916 /*
33 72675de7d229 Renamed slider class to percent class. Implemented my own percent widget bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 32 diff changeset	5917 * Returns the range of the percent bar.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5918 * Parameters:
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5919 * handle: Handle to the percent bar to be queried.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5920 */
510 710f82598210 Change function names to be inline with Mark Hessling's Rexx/DW. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 509 diff changeset	5921 unsigned int API dw_percent_get_range(HWND handle)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5922 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5923 return (unsigned int)SendMessage(handle, PBM_GETRANGE, (WPARAM)FALSE, 0);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5924 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5925
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5926 /*
33 72675de7d229 Renamed slider class to percent class. Implemented my own percent widget bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 32 diff changeset	5927 * Sets the percent bar position.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5928 * Parameters:
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5929 * handle: Handle to the percent bar to be set.
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5930 * position: Position of the percent bar withing the range.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5931 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5932 void API dw_percent_set_pos(HWND handle, unsigned int position)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5933 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5934 SendMessage(handle, PBM_SETPOS, (WPARAM)position, 0);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5935 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5936
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5937 /*
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5938 * Returns the position of the slider.
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5939 * Parameters:
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5940 * handle: Handle to the slider to be queried.
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5941 */
510 710f82598210 Change function names to be inline with Mark Hessling's Rexx/DW. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 509 diff changeset	5942 unsigned int API dw_slider_get_pos(HWND handle)
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5943 {
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5944 int max = (int)SendMessage(handle, TBM_GETRANGEMAX, 0, 0);
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5945 ULONG currentstyle = GetWindowLong(handle, GWL_STYLE);
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5946
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5947 if(currentstyle & TBS_VERT)
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5948 return max - (unsigned int)SendMessage(handle, TBM_GETPOS, 0, 0);
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5949 return (unsigned int)SendMessage(handle, TBM_GETPOS, 0, 0);
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5950 }
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5951
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5952 /*
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5953 * Sets the slider position.
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5954 * Parameters:
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5955 * handle: Handle to the slider to be set.
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5956 * position: Position of the slider withing the range.
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5957 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5958 void API dw_slider_set_pos(HWND handle, unsigned int position)
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5959 {
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5960 int max = (int)SendMessage(handle, TBM_GETRANGEMAX, 0, 0);
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5961 ULONG currentstyle = GetWindowLong(handle, GWL_STYLE);
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5962
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5963 if(currentstyle & TBS_VERT)
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5964 SendMessage(handle, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)max - position);
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5965 else
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5966 SendMessage(handle, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)position);
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5967 }
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5968
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5969 /*
197 f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5970 * Returns the position of the scrollbar.
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5971 * Parameters:
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5972 * handle: Handle to the scrollbar to be queried.
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5973 */
510 710f82598210 Change function names to be inline with Mark Hessling's Rexx/DW. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 509 diff changeset	5974 unsigned int API dw_scrollbar_get_pos(HWND handle)
197 f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5975 {
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5976 return (unsigned int)SendMessage(handle, SBM_GETPOS, 0, 0);
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5977 }
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5978
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5979 /*
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5980 * Sets the scrollbar position.
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5981 * Parameters:
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5982 * handle: Handle to the scrollbar to be set.
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5983 * position: Position of the scrollbar withing the range.
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5984 */
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5985 void API dw_scrollbar_set_pos(HWND handle, unsigned int position)
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5986 {
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5987 dw_window_set_data(handle, "_dw_scrollbar_value", (void *)position);
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5988 SendMessage(handle, SBM_SETPOS, (WPARAM)position, (LPARAM)TRUE);
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5989 }
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5990
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5991 /*
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5992 * Sets the scrollbar range.
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5993 * Parameters:
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5994 * handle: Handle to the scrollbar to be set.
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5995 * range: Maximum range value.
204 098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	5996 * visible: Visible area relative to the range.
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	5997 */
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	5998 void API dw_scrollbar_set_range(HWND handle, unsigned int range, unsigned int visible)
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	5999 {
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	6000 SCROLLINFO si;
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	6001
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	6002 si.cbSize = sizeof(SCROLLINFO);
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	6003 si.fMask = SIF_RANGE \| SIF_PAGE;
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	6004 si.nMin = 0;
209 85f25e8c1b1e nMax is inclusive or exclusive? bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 204 diff changeset	6005 si.nMax = range - 1;
204 098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	6006 si.nPage = visible;
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	6007 SendMessage(handle, SBM_SETSCROLLINFO, (WPARAM)TRUE, (LPARAM)&si);
197 f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	6008 }
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	6009
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	6010 /*
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6011 * Sets the spinbutton value.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6012 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6013 * handle: Handle to the spinbutton to be set.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6014 * position: Current value of the spinbutton.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6015 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6016 void API dw_spinbutton_set_pos(HWND handle, long position)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6017 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6018 char tmpbuf[100];
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	6019 ColorInfo cinfo = (ColorInfo )GetWindowLongPtr(handle, GWLP_USERDATA);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6020
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6021 sprintf(tmpbuf, "%d", position);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6022
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6023 if(cinfo && cinfo->buddy)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6024 SetWindowText(cinfo->buddy, tmpbuf);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6025
75 c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	6026 if(IS_IE5PLUS)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6027 SendMessage(handle, UDM_SETPOS32, 0, (LPARAM)position);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6028 else
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6029 SendMessage(handle, UDM_SETPOS, 0, (LPARAM)MAKELONG((short)position, 0));
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6030 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6031
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6032 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6033 * Sets the spinbutton limits.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6034 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6035 * handle: Handle to the spinbutton to be set.
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6036 * position: Current value of the spinbutton.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6037 * position: Current value of the spinbutton.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6038 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6039 void API dw_spinbutton_set_limits(HWND handle, long upper, long lower)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6040 {
75 c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	6041 if(IS_IE5PLUS)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6042 SendMessage(handle, UDM_SETRANGE32, (WPARAM)lower,(LPARAM)upper);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6043 else
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6044 SendMessage(handle, UDM_SETRANGE32, (WPARAM)((short)lower),
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6045 (LPARAM)((short)upper));
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6046 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6047
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6048 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6049 * Sets the entryfield character limit.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6050 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6051 * handle: Handle to the spinbutton to be set.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6052 * limit: Number of characters the entryfield will take.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6053 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6054 void API dw_entryfield_set_limit(HWND handle, ULONG limit)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6055 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6056 SendMessage(handle, EM_SETLIMITTEXT, (WPARAM)limit, 0);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6057 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6058
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6059 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6060 * Returns the current value of the spinbutton.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6061 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6062 * handle: Handle to the spinbutton to be queried.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6063 */
510 710f82598210 Change function names to be inline with Mark Hessling's Rexx/DW. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 509 diff changeset	6064 long API dw_spinbutton_get_pos(HWND handle)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6065 {
75 c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	6066 if(IS_IE5PLUS)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6067 return (long)SendMessage(handle, UDM_GETPOS32, 0, 0);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6068 else
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6069 return (long)SendMessage(handle, UDM_GETPOS, 0, 0);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6070 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6071
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6072 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6073 * Returns the state of the checkbox.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6074 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6075 * handle: Handle to the checkbox to be queried.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6076 */
510 710f82598210 Change function names to be inline with Mark Hessling's Rexx/DW. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 509 diff changeset	6077 int API dw_checkbox_get(HWND handle)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6078 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6079 if(SendMessage(handle, BM_GETCHECK, 0, 0) == BST_CHECKED)
60 61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6080 return (in_checkbox_handler ? FALSE : TRUE);
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6081 return (in_checkbox_handler ? TRUE : FALSE);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6082 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6083
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	6084 /* This function unchecks all radiobuttons on a box */
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	6085 BOOL CALLBACK _uncheck_radios(HWND handle, LPARAM lParam)
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	6086 {
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	6087 char tmpbuf[100];
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	6088
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	6089 GetClassName(handle, tmpbuf, 99);
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	6090
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	6091 if(strnicmp(tmpbuf, BUTTONCLASSNAME, strlen(BUTTONCLASSNAME)+1)==0)
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	6092 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	6093 BubbleButton bubble= (BubbleButton )GetWindowLongPtr(handle, GWLP_USERDATA);
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	6094
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	6095 if(bubble && !bubble->checkbox)
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	6096 SendMessage(handle, BM_SETCHECK, 0, 0);
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	6097 }
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	6098 return TRUE;
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	6099 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6100 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6101 * Sets the state of the checkbox.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6102 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6103 * handle: Handle to the checkbox to be queried.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6104 * value: TRUE for checked, FALSE for unchecked.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6105 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6106 void API dw_checkbox_set(HWND handle, int value)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6107 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	6108 BubbleButton bubble= (BubbleButton )GetWindowLongPtr(handle, GWLP_USERDATA);
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	6109
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	6110 if(bubble && !bubble->checkbox)
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	6111 {
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	6112 HWND parent = GetParent(handle);
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	6113
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	6114 if(parent)
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	6115 EnumChildWindows(parent, _uncheck_radios, 0);
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	6116 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6117 SendMessage(handle, BM_SETCHECK, (WPARAM)value, 0);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6118 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6119
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6120 /*
60 61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6121 * Inserts an item into a tree window (widget) after another item.
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6122 * Parameters:
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6123 * handle: Handle to the tree to be inserted.
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6124 * item: Handle to the item to be positioned after.
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6125 * title: The text title of the entry.
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6126 * icon: Handle to coresponding icon.
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6127 * parent: Parent handle or 0 if root.
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6128 * itemdata: Item specific data.
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6129 */
328 e00aff2b899e Tree item handles are now of the type HTREEITEM instead of HWND since they bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 321 diff changeset	6130 HTREEITEM API dw_tree_insert_after(HWND handle, HTREEITEM item, char title, unsigned long icon, HTREEITEM parent, void itemdata)
60 61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6131 {
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6132 TVITEM tvi;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6133 TVINSERTSTRUCT tvins;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6134 HTREEITEM hti;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6135 void *ptrs= malloc(sizeof(void ) * 2);
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6136
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6137 ptrs[0] = title;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6138 ptrs[1] = itemdata;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6139
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6140 tvi.mask = TVIF_TEXT \| TVIF_IMAGE \| TVIF_SELECTEDIMAGE \| TVIF_PARAM;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6141 tvi.pszText = title;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6142 tvi.lParam = (LONG)ptrs;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6143 tvi.cchTextMax = strlen(title);
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6144 tvi.iSelectedImage = tvi.iImage = _lookup_icon(handle, (HICON)icon, 1);
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6145
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6146 tvins.item = tvi;
328 e00aff2b899e Tree item handles are now of the type HTREEITEM instead of HWND since they bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 321 diff changeset	6147 tvins.hParent = parent;
e00aff2b899e Tree item handles are now of the type HTREEITEM instead of HWND since they bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 321 diff changeset	6148 tvins.hInsertAfter = item ? item : TVI_FIRST;
60 61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6149
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6150 hti = TreeView_InsertItem(handle, &tvins);
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6151
328 e00aff2b899e Tree item handles are now of the type HTREEITEM instead of HWND since they bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 321 diff changeset	6152 return hti;
60 61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6153 }
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6154
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6155 /*
22 6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6156 * Inserts an item into a tree window (widget).
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6157 * Parameters:
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6158 * handle: Handle to the tree to be inserted.
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6159 * title: The text title of the entry.
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6160 * icon: Handle to coresponding icon.
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6161 * parent: Parent handle or 0 if root.
54 c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6162 * itemdata: Item specific data.
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6163 */
328 e00aff2b899e Tree item handles are now of the type HTREEITEM instead of HWND since they bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 321 diff changeset	6164 HTREEITEM API dw_tree_insert(HWND handle, char title, unsigned long icon, HTREEITEM parent, void itemdata)
22 6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6165 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6166 TVITEM tvi;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6167 TVINSERTSTRUCT tvins;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6168 HTREEITEM hti;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6169 void *ptrs= malloc(sizeof(void ) * 2);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6170
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6171 ptrs[0] = title;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6172 ptrs[1] = itemdata;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6173
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6174 tvi.mask = TVIF_TEXT \| TVIF_IMAGE \| TVIF_SELECTEDIMAGE \| TVIF_PARAM;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6175 tvi.pszText = title;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6176 tvi.lParam = (LONG)ptrs;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6177 tvi.cchTextMax = strlen(title);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6178 tvi.iSelectedImage = tvi.iImage = _lookup_icon(handle, (HICON)icon, 1);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6179
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6180 tvins.item = tvi;
328 e00aff2b899e Tree item handles are now of the type HTREEITEM instead of HWND since they bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 321 diff changeset	6181 tvins.hParent = parent;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6182 tvins.hInsertAfter = TVI_LAST;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6183
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6184 hti = TreeView_InsertItem(handle, &tvins);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6185
328 e00aff2b899e Tree item handles are now of the type HTREEITEM instead of HWND since they bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 321 diff changeset	6186 return hti;
22 6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6187 }
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6188
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6189 /*
54 c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6190 * Sets the text and icon of an item in a tree window (widget).
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6191 * Parameters:
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6192 * handle: Handle to the tree containing the item.
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6193 * item: Handle of the item to be modified.
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6194 * title: The text title of the entry.
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6195 * icon: Handle to coresponding icon.
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6196 */
510 710f82598210 Change function names to be inline with Mark Hessling's Rexx/DW. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 509 diff changeset	6197 void API dw_tree_item_change(HWND handle, HTREEITEM item, char *title, unsigned long icon)
54 c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6198 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6199 TVITEM tvi;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6200 void **ptrs;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6201
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6202 tvi.mask = TVIF_HANDLE;
328 e00aff2b899e Tree item handles are now of the type HTREEITEM instead of HWND since they bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 321 diff changeset	6203 tvi.hItem = item;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6204
60 61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6205 if(TreeView_GetItem(handle, &tvi))
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6206 {
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6207
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6208 ptrs = (void **)tvi.lParam;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6209 ptrs[0] = title;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6210
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6211 tvi.mask = TVIF_TEXT \| TVIF_IMAGE \| TVIF_SELECTEDIMAGE;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6212 tvi.pszText = title;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6213 tvi.cchTextMax = strlen(title);
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6214 tvi.iSelectedImage = tvi.iImage = _lookup_icon(handle, (HICON)icon, 1);
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6215 tvi.hItem = (HTREEITEM)item;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6216
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6217 TreeView_SetItem(handle, &tvi);
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6218 }
54 c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6219 }
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6220
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6221 /*
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6222 * Sets the item data of a tree item.
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6223 * Parameters:
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6224 * handle: Handle to the tree containing the item.
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6225 * item: Handle of the item to be modified.
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6226 * itemdata: User defined data to be associated with item.
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6227 */
513 7755599311d4 Fixes search and replace errors. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 511 diff changeset	6228 void API dw_tree_item_set_data(HWND handle, HTREEITEM item, void *itemdata)
54 c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6229 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6230 TVITEM tvi;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6231 void **ptrs;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6232
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6233 tvi.mask = TVIF_HANDLE;
328 e00aff2b899e Tree item handles are now of the type HTREEITEM instead of HWND since they bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 321 diff changeset	6234 tvi.hItem = item;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6235
60 61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6236 if(TreeView_GetItem(handle, &tvi))
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6237 {
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6238 ptrs = (void **)tvi.lParam;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6239 ptrs[1] = itemdata;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6240 }
54 c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6241 }
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6242
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6243 /*
317 83edbd751da9 Added dw_tree_get_data() to get a tree item's data. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 312 diff changeset	6244 * Gets the item data of a tree item.
83edbd751da9 Added dw_tree_get_data() to get a tree item's data. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 312 diff changeset	6245 * Parameters:
83edbd751da9 Added dw_tree_get_data() to get a tree item's data. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 312 diff changeset	6246 * handle: Handle to the tree containing the item.
83edbd751da9 Added dw_tree_get_data() to get a tree item's data. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 312 diff changeset	6247 * item: Handle of the item to be modified.
83edbd751da9 Added dw_tree_get_data() to get a tree item's data. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 312 diff changeset	6248 */
510 710f82598210 Change function names to be inline with Mark Hessling's Rexx/DW. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 509 diff changeset	6249 void * API dw_tree_item_get_data(HWND handle, HTREEITEM item)
317 83edbd751da9 Added dw_tree_get_data() to get a tree item's data. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 312 diff changeset	6250 {
83edbd751da9 Added dw_tree_get_data() to get a tree item's data. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 312 diff changeset	6251 TVITEM tvi;
83edbd751da9 Added dw_tree_get_data() to get a tree item's data. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 312 diff changeset	6252 void **ptrs;
83edbd751da9 Added dw_tree_get_data() to get a tree item's data. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 312 diff changeset	6253
83edbd751da9 Added dw_tree_get_data() to get a tree item's data. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 312 diff changeset	6254 tvi.mask = TVIF_HANDLE;
328 e00aff2b899e Tree item handles are now of the type HTREEITEM instead of HWND since they bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 321 diff changeset	6255 tvi.hItem = item;
317 83edbd751da9 Added dw_tree_get_data() to get a tree item's data. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 312 diff changeset	6256
83edbd751da9 Added dw_tree_get_data() to get a tree item's data. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 312 diff changeset	6257 if(TreeView_GetItem(handle, &tvi))
83edbd751da9 Added dw_tree_get_data() to get a tree item's data. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 312 diff changeset	6258 {
83edbd751da9 Added dw_tree_get_data() to get a tree item's data. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 312 diff changeset	6259 ptrs = (void **)tvi.lParam;
83edbd751da9 Added dw_tree_get_data() to get a tree item's data. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 312 diff changeset	6260 return ptrs[1];
83edbd751da9 Added dw_tree_get_data() to get a tree item's data. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 312 diff changeset	6261 }
83edbd751da9 Added dw_tree_get_data() to get a tree item's data. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 312 diff changeset	6262 return NULL;
83edbd751da9 Added dw_tree_get_data() to get a tree item's data. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 312 diff changeset	6263 }
83edbd751da9 Added dw_tree_get_data() to get a tree item's data. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 312 diff changeset	6264
83edbd751da9 Added dw_tree_get_data() to get a tree item's data. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 312 diff changeset	6265 /*
481 97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	6266 * Gets the text an item in a tree window (widget).
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	6267 * Parameters:
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	6268 * handle: Handle to the tree containing the item.
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	6269 * item: Handle of the item to be modified.
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	6270 */
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	6271 char * API dw_tree_get_title(HWND handle, HTREEITEM item)
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	6272 {
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	6273 TVITEM tvi;
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	6274
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	6275 tvi.mask = TVIF_HANDLE;
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	6276 tvi.hItem = item;
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	6277
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	6278 if(TreeView_GetItem(handle, &tvi))
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	6279 return tvi.pszText;
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	6280 return NULL;
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	6281 }
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	6282
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	6283 /*
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	6284 * Gets the text an item in a tree window (widget).
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	6285 * Parameters:
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	6286 * handle: Handle to the tree containing the item.
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	6287 * item: Handle of the item to be modified.
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	6288 */
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	6289 HTREEITEM API dw_tree_get_parent(HWND handle, HTREEITEM item)
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	6290 {
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	6291 return TreeView_GetParent(handle, item);
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	6292 }
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	6293
97c2c560f829 Implemented the new tree functions and signal on Windows and exported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 473 diff changeset	6294 /*
54 c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6295 * Sets this item as the active selection.
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6296 * Parameters:
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6297 * handle: Handle to the tree window (widget) to be selected.
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6298 * item: Handle to the item to be selected.
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6299 */
328 e00aff2b899e Tree item handles are now of the type HTREEITEM instead of HWND since they bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 321 diff changeset	6300 void API dw_tree_item_select(HWND handle, HTREEITEM item)
54 c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6301 {
321 be76b984620a Make sure dw_tree_item_select() does not cause a DW_SIGNAL_ITEM_SELECT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 318 diff changeset	6302 dw_window_set_data(handle, "_dw_select_item", (void *)1);
328 e00aff2b899e Tree item handles are now of the type HTREEITEM instead of HWND since they bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 321 diff changeset	6303 TreeView_SelectItem(handle, item);
321 be76b984620a Make sure dw_tree_item_select() does not cause a DW_SIGNAL_ITEM_SELECT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 318 diff changeset	6304 dw_window_set_data(handle, "_dw_select_item", (void *)0);
54 c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6305 }
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6306
291 70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6307 /* Delete all tree subitems */
510 710f82598210 Change function names to be inline with Mark Hessling's Rexx/DW. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 509 diff changeset	6308 void _dw_tree_item_delete_recursive(HWND handle, HTREEITEM node)
291 70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6309 {
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6310 HTREEITEM hti;
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6311
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6312 hti = TreeView_GetChild(handle, node);
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6313
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6314 while(hti)
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6315 {
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6316 HTREEITEM lastitem = hti;
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6317
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6318 hti = TreeView_GetNextSibling(handle, hti);
510 710f82598210 Change function names to be inline with Mark Hessling's Rexx/DW. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 509 diff changeset	6319 dw_tree_item_delete(handle, lastitem);
291 70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6320 }
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6321 }
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6322
54 c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6323 /*
30 b1d7e8a28dfa Added tree view functions and signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 22 diff changeset	6324 * Removes all nodes from a tree.
b1d7e8a28dfa Added tree view functions and signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 22 diff changeset	6325 * Parameters:
b1d7e8a28dfa Added tree view functions and signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 22 diff changeset	6326 * handle: Handle to the window (widget) to be cleared.
b1d7e8a28dfa Added tree view functions and signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 22 diff changeset	6327 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6328 void API dw_tree_clear(HWND handle)
30 b1d7e8a28dfa Added tree view functions and signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 22 diff changeset	6329 {
291 70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6330 HTREEITEM hti = TreeView_GetRoot(handle);
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6331
388 6b573770f446 Stop select events during dw_tree_clear(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 371 diff changeset	6332 dw_window_set_data(handle, "_dw_select_item", (void *)1);
291 70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6333 while(hti)
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6334 {
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6335 HTREEITEM lastitem = hti;
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6336
510 710f82598210 Change function names to be inline with Mark Hessling's Rexx/DW. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 509 diff changeset	6337 _dw_tree_item_delete_recursive(handle, hti);
291 70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6338 hti = TreeView_GetNextSibling(handle, hti);
510 710f82598210 Change function names to be inline with Mark Hessling's Rexx/DW. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 509 diff changeset	6339 dw_tree_item_delete(handle, lastitem);
291 70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6340 }
388 6b573770f446 Stop select events during dw_tree_clear(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 371 diff changeset	6341 dw_window_set_data(handle, "_dw_select_item", (void *)0);
30 b1d7e8a28dfa Added tree view functions and signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 22 diff changeset	6342 }
b1d7e8a28dfa Added tree view functions and signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 22 diff changeset	6343
b1d7e8a28dfa Added tree view functions and signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 22 diff changeset	6344 /*
54 c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6345 * Expands a node on a tree.
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6346 * Parameters:
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6347 * handle: Handle to the tree window (widget).
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6348 * item: Handle to node to be expanded.
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6349 */
510 710f82598210 Change function names to be inline with Mark Hessling's Rexx/DW. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 509 diff changeset	6350 void API dw_tree_item_expand(HWND handle, HTREEITEM item)
328 e00aff2b899e Tree item handles are now of the type HTREEITEM instead of HWND since they bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 321 diff changeset	6351 {
e00aff2b899e Tree item handles are now of the type HTREEITEM instead of HWND since they bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 321 diff changeset	6352 TreeView_Expand(handle, item, TVE_EXPAND);
54 c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6353 }
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6354
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6355 /*
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6356 * Collapses a node on a tree.
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6357 * Parameters:
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6358 * handle: Handle to the tree window (widget).
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6359 * item: Handle to node to be collapsed.
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6360 */
510 710f82598210 Change function names to be inline with Mark Hessling's Rexx/DW. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 509 diff changeset	6361 void API dw_tree_item_collapse(HWND handle, HTREEITEM item)
328 e00aff2b899e Tree item handles are now of the type HTREEITEM instead of HWND since they bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 321 diff changeset	6362 {
e00aff2b899e Tree item handles are now of the type HTREEITEM instead of HWND since they bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 321 diff changeset	6363 TreeView_Expand(handle, item, TVE_COLLAPSE);
54 c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6364 }
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6365
c4e1139d9872 Added new tree functions, and fixed a memory leak as well as use of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 52 diff changeset	6366 /*
30 b1d7e8a28dfa Added tree view functions and signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 22 diff changeset	6367 * Removes a node from a tree.
b1d7e8a28dfa Added tree view functions and signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 22 diff changeset	6368 * Parameters:
b1d7e8a28dfa Added tree view functions and signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 22 diff changeset	6369 * handle: Handle to the window (widget) to be cleared.
b1d7e8a28dfa Added tree view functions and signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 22 diff changeset	6370 * item: Handle to node to be deleted.
b1d7e8a28dfa Added tree view functions and signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 22 diff changeset	6371 */
510 710f82598210 Change function names to be inline with Mark Hessling's Rexx/DW. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 509 diff changeset	6372 void API dw_tree_item_delete(HWND handle, HTREEITEM item)
30 b1d7e8a28dfa Added tree view functions and signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 22 diff changeset	6373 {
291 70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6374 TVITEM tvi;
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6375 void **ptrs;
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6376
328 e00aff2b899e Tree item handles are now of the type HTREEITEM instead of HWND since they bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 321 diff changeset	6377 if(item == TVI_ROOT \|\| !item)
60 61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6378 return;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6379
291 70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6380 tvi.mask = TVIF_HANDLE;
328 e00aff2b899e Tree item handles are now of the type HTREEITEM instead of HWND since they bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 321 diff changeset	6381 tvi.hItem = item;
291 70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6382
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6383 if(TreeView_GetItem(handle, &tvi))
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6384 ptrs = (void **)tvi.lParam;
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6385
510 710f82598210 Change function names to be inline with Mark Hessling's Rexx/DW. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 509 diff changeset	6386 _dw_tree_item_delete_recursive(handle, item);
328 e00aff2b899e Tree item handles are now of the type HTREEITEM instead of HWND since they bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 321 diff changeset	6387 TreeView_DeleteItem(handle, item);
291 70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6388 if(ptrs)
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6389 free(ptrs);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6390 }
30 b1d7e8a28dfa Added tree view functions and signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 22 diff changeset	6391
b1d7e8a28dfa Added tree view functions and signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 22 diff changeset	6392 /*
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6393 * Sets up the container columns.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6394 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6395 * handle: Handle to the container to be configured.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6396 * flags: An array of unsigned longs with column flags.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6397 * titles: An array of strings with column text titles.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6398 * count: The number of columns (this should match the arrays).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6399 * separator: The column number that contains the main separator.
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6400 * (only used on OS/2 but must be >= 0 on all)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6401 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6402 int API dw_container_setup(HWND handle, unsigned long flags, char *titles, int count, int separator)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6403 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	6404 ContainerInfo cinfo = (ContainerInfo )GetWindowLongPtr(handle, GWLP_USERDATA);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6405 int z, l = 0;
105 ad95fc623ff3 Some changes to the container optimization code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 104 diff changeset	6406 unsigned long *tempflags = calloc(sizeof(unsigned long), count + 2);
355 3a71623fc219 Changes to implement justification on container columns. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 351 diff changeset	6407 LVCOLUMN lvc;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6408
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6409 if(separator == -1)
105 ad95fc623ff3 Some changes to the container optimization code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 104 diff changeset	6410 {
ad95fc623ff3 Some changes to the container optimization code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 104 diff changeset	6411 tempflags[0] = DW_CFA_RESERVED;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6412 l = 1;
105 ad95fc623ff3 Some changes to the container optimization code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 104 diff changeset	6413 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6414
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6415 memcpy(&tempflags[l], flags, sizeof(unsigned long) * count);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6416 tempflags[count + l] = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6417 cinfo->flags = tempflags;
71 291c30a92b9b Fixed a bug where if dw_filesystem_* was used then the last column bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 69 diff changeset	6418 cinfo->columns = count + l;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6419
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6420
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6421 for(z=0;z<count;z++)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6422 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6423 if(titles[z])
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6424 {
355 3a71623fc219 Changes to implement justification on container columns. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 351 diff changeset	6425 lvc.mask = LVCF_TEXT \| LVCF_WIDTH \| LVCF_SUBITEM \| LVCF_FMT;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6426 lvc.pszText = titles[z];
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6427 lvc.cchTextMax = strlen(titles[z]);
355 3a71623fc219 Changes to implement justification on container columns. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 351 diff changeset	6428 if(flags[z] & DW_CFA_RIGHT)
3a71623fc219 Changes to implement justification on container columns. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 351 diff changeset	6429 lvc.fmt = LVCFMT_RIGHT;
3a71623fc219 Changes to implement justification on container columns. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 351 diff changeset	6430 else if(flags[z] & DW_CFA_CENTER)
3a71623fc219 Changes to implement justification on container columns. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 351 diff changeset	6431 lvc.fmt = LVCFMT_CENTER;
3a71623fc219 Changes to implement justification on container columns. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 351 diff changeset	6432 else
3a71623fc219 Changes to implement justification on container columns. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 351 diff changeset	6433 lvc.fmt = LVCFMT_LEFT;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6434 lvc.cx = 75;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6435 lvc.iSubItem = count;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6436 SendMessage(handle, LVM_INSERTCOLUMN, (WPARAM)z + l, (LPARAM)&lvc);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6437 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6438 }
168 627e531ca530 Allow subitems to have icons so the container controls will be the same bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 167 diff changeset	6439 ListView_SetExtendedListViewStyle(handle, LVS_EX_FULLROWSELECT \| LVS_EX_SUBITEMIMAGES);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6440 return TRUE;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6441 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6442
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6443 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6444 * Sets up the filesystem columns, note: filesystem always has an icon/filename field.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6445 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6446 * handle: Handle to the container to be configured.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6447 * flags: An array of unsigned longs with column flags.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6448 * titles: An array of strings with column text titles.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6449 * count: The number of columns (this should match the arrays).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6450 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6451 int API dw_filesystem_setup(HWND handle, unsigned long flags, char *titles, int count)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6452 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6453 LV_COLUMN lvc;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6454
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6455 lvc.mask = LVCF_TEXT \| LVCF_WIDTH \| LVCF_SUBITEM;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6456 lvc.pszText = "Filename";
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6457 lvc.cchTextMax = 8;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6458 lvc.fmt = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6459 if(!count)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6460 lvc.cx = 300;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6461 else
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6462 lvc.cx = 150;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6463 lvc.iSubItem = count;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6464 SendMessage(handle, LVM_INSERTCOLUMN, (WPARAM)0, (LPARAM)&lvc);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6465 dw_container_setup(handle, flags, titles, count, -1);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6466 return TRUE;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6467 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6468
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6469 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6470 * Obtains an icon from a module (or header in GTK).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6471 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6472 * module: Handle to module (DLL) in OS/2 and Windows.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6473 * id: A unsigned long id int the resources on OS/2 and
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6474 * Windows, on GTK this is converted to a pointer
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6475 * to an embedded XPM.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6476 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6477 unsigned long API dw_icon_load(unsigned long module, unsigned long id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6478 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6479 return (unsigned long)LoadIcon(DWInstance, MAKEINTRESOURCE(id));
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6480 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6481
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6482 /*
257 9ea4ac9a097f Added dw_icon_load_from_file() on OS/2 and Windows. Added a stub on Unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 248 diff changeset	6483 * Obtains an icon from a file.
9ea4ac9a097f Added dw_icon_load_from_file() on OS/2 and Windows. Added a stub on Unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 248 diff changeset	6484 * Parameters:
9ea4ac9a097f Added dw_icon_load_from_file() on OS/2 and Windows. Added a stub on Unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 248 diff changeset	6485 * filename: Name of the file, omit extention to have
9ea4ac9a097f Added dw_icon_load_from_file() on OS/2 and Windows. Added a stub on Unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 248 diff changeset	6486 * DW pick the appropriate file extension.
9ea4ac9a097f Added dw_icon_load_from_file() on OS/2 and Windows. Added a stub on Unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 248 diff changeset	6487 * (ICO on OS/2 or Windows, XPM on Unix)
9ea4ac9a097f Added dw_icon_load_from_file() on OS/2 and Windows. Added a stub on Unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 248 diff changeset	6488 */
9ea4ac9a097f Added dw_icon_load_from_file() on OS/2 and Windows. Added a stub on Unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 248 diff changeset	6489 unsigned long API dw_icon_load_from_file(char *filename)
9ea4ac9a097f Added dw_icon_load_from_file() on OS/2 and Windows. Added a stub on Unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 248 diff changeset	6490 {
9ea4ac9a097f Added dw_icon_load_from_file() on OS/2 and Windows. Added a stub on Unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 248 diff changeset	6491 char *file = malloc(strlen(filename) + 5);
9ea4ac9a097f Added dw_icon_load_from_file() on OS/2 and Windows. Added a stub on Unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 248 diff changeset	6492 HANDLE icon;
9ea4ac9a097f Added dw_icon_load_from_file() on OS/2 and Windows. Added a stub on Unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 248 diff changeset	6493
9ea4ac9a097f Added dw_icon_load_from_file() on OS/2 and Windows. Added a stub on Unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 248 diff changeset	6494 if(!file)
9ea4ac9a097f Added dw_icon_load_from_file() on OS/2 and Windows. Added a stub on Unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 248 diff changeset	6495 return 0;
9ea4ac9a097f Added dw_icon_load_from_file() on OS/2 and Windows. Added a stub on Unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 248 diff changeset	6496
9ea4ac9a097f Added dw_icon_load_from_file() on OS/2 and Windows. Added a stub on Unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 248 diff changeset	6497 strcpy(file, filename);
9ea4ac9a097f Added dw_icon_load_from_file() on OS/2 and Windows. Added a stub on Unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 248 diff changeset	6498
9ea4ac9a097f Added dw_icon_load_from_file() on OS/2 and Windows. Added a stub on Unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 248 diff changeset	6499 /* check if we can read from this file (it exists and read permission) */
9ea4ac9a097f Added dw_icon_load_from_file() on OS/2 and Windows. Added a stub on Unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 248 diff changeset	6500 if(access(file, 04) != 0)
9ea4ac9a097f Added dw_icon_load_from_file() on OS/2 and Windows. Added a stub on Unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 248 diff changeset	6501 {
9ea4ac9a097f Added dw_icon_load_from_file() on OS/2 and Windows. Added a stub on Unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 248 diff changeset	6502 /* Try with .bmp extention */
9ea4ac9a097f Added dw_icon_load_from_file() on OS/2 and Windows. Added a stub on Unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 248 diff changeset	6503 strcat(file, ".ico");
9ea4ac9a097f Added dw_icon_load_from_file() on OS/2 and Windows. Added a stub on Unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 248 diff changeset	6504 if(access(file, 04) != 0)
9ea4ac9a097f Added dw_icon_load_from_file() on OS/2 and Windows. Added a stub on Unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 248 diff changeset	6505 {
9ea4ac9a097f Added dw_icon_load_from_file() on OS/2 and Windows. Added a stub on Unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 248 diff changeset	6506 free(file);
9ea4ac9a097f Added dw_icon_load_from_file() on OS/2 and Windows. Added a stub on Unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 248 diff changeset	6507 return 0;
9ea4ac9a097f Added dw_icon_load_from_file() on OS/2 and Windows. Added a stub on Unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 248 diff changeset	6508 }
9ea4ac9a097f Added dw_icon_load_from_file() on OS/2 and Windows. Added a stub on Unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 248 diff changeset	6509 }
9ea4ac9a097f Added dw_icon_load_from_file() on OS/2 and Windows. Added a stub on Unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 248 diff changeset	6510 icon = LoadImage(NULL, file, IMAGE_ICON, 0, 0, LR_LOADFROMFILE);
9ea4ac9a097f Added dw_icon_load_from_file() on OS/2 and Windows. Added a stub on Unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 248 diff changeset	6511 free(file);
9ea4ac9a097f Added dw_icon_load_from_file() on OS/2 and Windows. Added a stub on Unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 248 diff changeset	6512 return (unsigned long)icon;
9ea4ac9a097f Added dw_icon_load_from_file() on OS/2 and Windows. Added a stub on Unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 248 diff changeset	6513 }
9ea4ac9a097f Added dw_icon_load_from_file() on OS/2 and Windows. Added a stub on Unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 248 diff changeset	6514
9ea4ac9a097f Added dw_icon_load_from_file() on OS/2 and Windows. Added a stub on Unix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 248 diff changeset	6515 /*
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6516 * Frees a loaded resource in OS/2 and Windows.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6517 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6518 * handle: Handle to icon returned by dw_icon_load().
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6519 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6520 void API dw_icon_free(unsigned long handle)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6521 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6522 DestroyIcon((HICON)handle);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6523 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6524
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6525 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6526 * Allocates memory used to populate a container.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6527 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6528 * handle: Handle to the container window (widget).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6529 * rowcount: The number of items to be populated.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6530 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6531 void * API dw_container_alloc(HWND handle, int rowcount)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6532 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6533 LV_ITEM lvi;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6534 int z;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6535
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6536 lvi.mask = LVIF_DI_SETITEM \| LVIF_TEXT \| LVIF_IMAGE;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6537 lvi.iSubItem = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6538 /* Insert at the end */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6539 lvi.iItem = 1000000;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6540 lvi.pszText = "";
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6541 lvi.cchTextMax = 1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6542 lvi.iImage = -1;
7 005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	6543
79 8082cb0e7c2e Updated to the latest DW. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 75 diff changeset	6544 ShowWindow(handle, SW_HIDE);
7 005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	6545 for(z=0;z<rowcount;z++)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6546 ListView_InsertItem(handle, &lvi);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6547 return (void *)handle;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6548 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6549
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6550 /* Finds a icon in the table, otherwise it adds it to the table
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6551 * and returns the index in the table.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6552 */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6553 int _lookup_icon(HWND handle, HICON hicon, int type)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6554 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6555 int z;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6556 static HWND lasthwnd = NULL;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6557
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6558 if(!hSmall \|\| !hLarge)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6559 {
67 ab9b0fa6c66e Focus fixes and removal of several hack in the OS/2 code base. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 63 diff changeset	6560 hSmall = ImageList_Create(16, 16, ILC_COLOR16 \| ILC_MASK, ICON_INDEX_LIMIT, 0);
ab9b0fa6c66e Focus fixes and removal of several hack in the OS/2 code base. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 63 diff changeset	6561 hLarge = ImageList_Create(32, 32, ILC_COLOR16 \| ILC_MASK, ICON_INDEX_LIMIT, 0);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6562 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6563 for(z=0;z<ICON_INDEX_LIMIT;z++)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6564 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6565 if(!lookup[z])
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6566 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6567 lookup[z] = hicon;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6568 ImageList_AddIcon(hSmall, hicon);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6569 ImageList_AddIcon(hLarge, hicon);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6570 if(type)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6571 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6572 TreeView_SetImageList(handle, hSmall, TVSIL_NORMAL);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6573 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6574 else
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6575 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6576 ListView_SetImageList(handle, hSmall, LVSIL_SMALL);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6577 ListView_SetImageList(handle, hLarge, LVSIL_NORMAL);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6578 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6579 lasthwnd = handle;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6580 return z;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6581 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6582
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6583 if(hicon == lookup[z])
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6584 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6585 if(lasthwnd != handle)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6586 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6587 if(type)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6588 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6589 TreeView_SetImageList(handle, hSmall, TVSIL_NORMAL);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6590 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6591 else
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6592 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6593 ListView_SetImageList(handle, hSmall, LVSIL_SMALL);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6594 ListView_SetImageList(handle, hLarge, LVSIL_NORMAL);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6595 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6596 lasthwnd = handle;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6597 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6598 return z;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6599 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6600 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6601 return -1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6602 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6603
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6604 /*
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6605 * Sets an item in specified row and column to the given data.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6606 * Parameters:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6607 * handle: Handle to the container window (widget).
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6608 * pointer: Pointer to the allocated memory in dw_container_alloc().
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6609 * column: Zero based column of data being set.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6610 * row: Zero based row of data being set.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6611 * data: Pointer to the data to be added.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6612 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6613 void API dw_filesystem_set_file(HWND handle, void pointer, int row, char filename, unsigned long icon)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6614 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6615 LV_ITEM lvi;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6616
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6617 lvi.iItem = row;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6618 lvi.iSubItem = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6619 lvi.mask = LVIF_DI_SETITEM \| LVIF_IMAGE \| LVIF_TEXT;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6620 lvi.pszText = filename;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6621 lvi.cchTextMax = strlen(filename);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6622 lvi.iImage = _lookup_icon(handle, (HICON)icon, 0);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6623
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6624 ListView_SetItem(handle, &lvi);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6625 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6626
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6627 /*
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6628 * Sets an item in specified row and column to the given data.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6629 * Parameters:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6630 * handle: Handle to the container window (widget).
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6631 * pointer: Pointer to the allocated memory in dw_container_alloc().
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6632 * column: Zero based column of data being set.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6633 * row: Zero based row of data being set.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6634 * data: Pointer to the data to be added.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6635 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6636 void API dw_filesystem_set_item(HWND handle, void pointer, int column, int row, void data)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6637 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6638 dw_container_set_item(handle, pointer, column + 1, row, data);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6639 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6640
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6641 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6642 * Sets an item in specified row and column to the given data.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6643 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6644 * handle: Handle to the container window (widget).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6645 * pointer: Pointer to the allocated memory in dw_container_alloc().
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6646 * column: Zero based column of data being set.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6647 * row: Zero based row of data being set.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6648 * data: Pointer to the data to be added.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6649 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6650 void API dw_container_set_item(HWND handle, void pointer, int column, int row, void data)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6651 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	6652 ContainerInfo cinfo = (ContainerInfo )GetWindowLongPtr(handle, GWLP_USERDATA);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6653 ULONG *flags;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6654 LV_ITEM lvi;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6655 char textbuffer[100], *destptr = textbuffer;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6656
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6657 if(!cinfo \|\| !cinfo->flags \|\| !data)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6658 return;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6659
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6660 flags = cinfo->flags;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6661
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6662 lvi.mask = LVIF_DI_SETITEM \| LVIF_TEXT;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6663 lvi.iItem = row;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6664 lvi.iSubItem = column;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6665
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6666 if(flags[column] & DW_CFA_BITMAPORICON)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6667 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6668 HICON hicon = ((HICON )data);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6669
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6670 lvi.mask = LVIF_DI_SETITEM \| LVIF_IMAGE;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6671 lvi.pszText = NULL;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6672 lvi.cchTextMax = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6673
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6674 lvi.iImage = _lookup_icon(handle, hicon, 0);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6675 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6676 else if(flags[column] & DW_CFA_STRING)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6677 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6678 char tmp = ((char **)data);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6679
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6680 if(!tmp)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6681 tmp = "";
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6682
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6683 lvi.pszText = tmp;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6684 lvi.cchTextMax = strlen(tmp);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6685 destptr = tmp;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6686 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6687 else if(flags[column] & DW_CFA_ULONG)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6688 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6689 ULONG tmp = ((ULONG )data);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6690
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6691 sprintf(textbuffer, "%lu", tmp);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6692
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6693 lvi.pszText = textbuffer;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6694 lvi.cchTextMax = strlen(textbuffer);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6695 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6696 else if(flags[column] & DW_CFA_DATE)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6697 {
165 d03716228b7f Use strftime to display time and date on Windows and unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 161 diff changeset	6698 struct tm curtm;
d03716228b7f Use strftime to display time and date on Windows and unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 161 diff changeset	6699 CDATE cdate = ((CDATE )data);
d03716228b7f Use strftime to display time and date on Windows and unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 161 diff changeset	6700
d03716228b7f Use strftime to display time and date on Windows and unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 161 diff changeset	6701 curtm.tm_mday = cdate.day;
d03716228b7f Use strftime to display time and date on Windows and unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 161 diff changeset	6702 curtm.tm_mon = cdate.month - 1;
d03716228b7f Use strftime to display time and date on Windows and unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 161 diff changeset	6703 curtm.tm_year = cdate.year - 1900;
d03716228b7f Use strftime to display time and date on Windows and unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 161 diff changeset	6704
d03716228b7f Use strftime to display time and date on Windows and unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 161 diff changeset	6705 strftime(textbuffer, 100, "%x", &curtm);
d03716228b7f Use strftime to display time and date on Windows and unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 161 diff changeset	6706
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6707 lvi.pszText = textbuffer;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6708 lvi.cchTextMax = strlen(textbuffer);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6709 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6710 else if(flags[column] & DW_CFA_TIME)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6711 {
165 d03716228b7f Use strftime to display time and date on Windows and unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 161 diff changeset	6712 struct tm curtm;
d03716228b7f Use strftime to display time and date on Windows and unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 161 diff changeset	6713 CTIME ctime = ((CTIME )data);
d03716228b7f Use strftime to display time and date on Windows and unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 161 diff changeset	6714
d03716228b7f Use strftime to display time and date on Windows and unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 161 diff changeset	6715 curtm.tm_hour = ctime.hours;
d03716228b7f Use strftime to display time and date on Windows and unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 161 diff changeset	6716 curtm.tm_min = ctime.minutes;
d03716228b7f Use strftime to display time and date on Windows and unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 161 diff changeset	6717 curtm.tm_sec = ctime.seconds;
d03716228b7f Use strftime to display time and date on Windows and unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 161 diff changeset	6718
d03716228b7f Use strftime to display time and date on Windows and unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 161 diff changeset	6719 strftime(textbuffer, 100, "%X", &curtm);
d03716228b7f Use strftime to display time and date on Windows and unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 161 diff changeset	6720
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6721 lvi.pszText = textbuffer;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6722 lvi.cchTextMax = strlen(textbuffer);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6723 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6724
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6725 ListView_SetItem(handle, &lvi);
22 6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6726 }
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6727
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6728 /*
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6729 * Changes an existing item in specified row and column to the given data.
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6730 * Parameters:
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6731 * handle: Handle to the container window (widget).
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6732 * column: Zero based column of data being set.
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6733 * row: Zero based row of data being set.
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6734 * data: Pointer to the data to be added.
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6735 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6736 void API dw_container_change_item(HWND handle, int column, int row, void *data)
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6737 {
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6738 dw_container_set_item(handle, NULL, column, row, data);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6739 }
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6740
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6741 /*
503 f3ed8dda02f8 Added dw_filesystem_change_() and testcase code from Mark in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 502 diff changeset	6742 * Changes an existing item in specified row and column to the given data.
f3ed8dda02f8 Added dw_filesystem_change_() and testcase code from Mark in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 502 diff changeset	6743 * Parameters:
f3ed8dda02f8 Added dw_filesystem_change_() and testcase code from Mark in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 502 diff changeset	6744 * handle: Handle to the container window (widget).
f3ed8dda02f8 Added dw_filesystem_change_() and testcase code from Mark in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 502 diff changeset	6745 * column: Zero based column of data being set.
f3ed8dda02f8 Added dw_filesystem_change_() and testcase code from Mark in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 502 diff changeset	6746 * row: Zero based row of data being set.
f3ed8dda02f8 Added dw_filesystem_change_() and testcase code from Mark in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 502 diff changeset	6747 * data: Pointer to the data to be added.
f3ed8dda02f8 Added dw_filesystem_change_() and testcase code from Mark in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 502 diff changeset	6748 */
f3ed8dda02f8 Added dw_filesystem_change_() and testcase code from Mark in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 502 diff changeset	6749 void API dw_filesystem_change_item(HWND handle, int column, int row, void *data)
f3ed8dda02f8 Added dw_filesystem_change_() and testcase code from Mark in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 502 diff changeset	6750 {
505 2ecbb7963011 Another minor change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 503 diff changeset	6751 dw_filesystem_set_item(handle, NULL, column, row, data);
503 f3ed8dda02f8 Added dw_filesystem_change_() and testcase code from Mark in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 502 diff changeset	6752 }
f3ed8dda02f8 Added dw_filesystem_change_() and testcase code from Mark in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 502 diff changeset	6753
f3ed8dda02f8 Added dw_filesystem_change_() and testcase code from Mark in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 502 diff changeset	6754 /*
f3ed8dda02f8 Added dw_filesystem_change_() and testcase code from Mark in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 502 diff changeset	6755 * Changes an item in specified row and column to the given data.
f3ed8dda02f8 Added dw_filesystem_change_() and testcase code from Mark in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 502 diff changeset	6756 * Parameters:
f3ed8dda02f8 Added dw_filesystem_change_() and testcase code from Mark in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 502 diff changeset	6757 * handle: Handle to the container window (widget).
f3ed8dda02f8 Added dw_filesystem_change_() and testcase code from Mark in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 502 diff changeset	6758 * pointer: Pointer to the allocated memory in dw_container_alloc().
f3ed8dda02f8 Added dw_filesystem_change_() and testcase code from Mark in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 502 diff changeset	6759 * column: Zero based column of data being set.
f3ed8dda02f8 Added dw_filesystem_change_() and testcase code from Mark in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 502 diff changeset	6760 * row: Zero based row of data being set.
f3ed8dda02f8 Added dw_filesystem_change_() and testcase code from Mark in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 502 diff changeset	6761 * data: Pointer to the data to be added.
f3ed8dda02f8 Added dw_filesystem_change_() and testcase code from Mark in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 502 diff changeset	6762 */
f3ed8dda02f8 Added dw_filesystem_change_() and testcase code from Mark in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 502 diff changeset	6763 void API dw_filesystem_change_file(HWND handle, int row, char *filename, unsigned long icon)
f3ed8dda02f8 Added dw_filesystem_change_() and testcase code from Mark in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 502 diff changeset	6764 {
505 2ecbb7963011 Another minor change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 503 diff changeset	6765 dw_filesystem_set_file(handle, NULL, row, filename, icon);
503 f3ed8dda02f8 Added dw_filesystem_change_() and testcase code from Mark in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 502 diff changeset	6766 }
f3ed8dda02f8 Added dw_filesystem_change_() and testcase code from Mark in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 502 diff changeset	6767
f3ed8dda02f8 Added dw_filesystem_change_() and testcase code from Mark in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 502 diff changeset	6768 /*
508 078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6769 * Gets column type for a container column
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6770 * Parameters:
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6771 * handle: Handle to the container window (widget).
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6772 * column: Zero based column.
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6773 */
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6774 int API dw_container_get_column_type(HWND handle, int column)
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6775 {
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6776 ContainerInfo cinfo = (ContainerInfo )GetWindowLongPtr(handle, GWLP_USERDATA);
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6777 ULONG *flags;
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6778 int rc;
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6779
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6780 if(!cinfo \|\| !cinfo->flags)
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6781 return 0;
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6782
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6783 flags = cinfo->flags;
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6784
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6785 if(flags[column] & DW_CFA_BITMAPORICON)
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6786 rc = DW_CFA_BITMAPORICON;
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6787 else if(flags[column] & DW_CFA_STRING)
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6788 rc = DW_CFA_STRING;
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6789 else if(flags[column] & DW_CFA_ULONG)
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6790 rc = DW_CFA_ULONG;
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6791 else if(flags[column] & DW_CFA_DATE)
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6792 rc = DW_CFA_DATE;
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6793 else if(flags[column] & DW_CFA_TIME)
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6794 rc = DW_CFA_TIME;
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6795 else
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6796 rc = 0;
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6797 return rc;
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6798 }
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6799
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6800 /*
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6801 * Gets column type for a filesystem container column
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6802 * Parameters:
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6803 * handle: Handle to the container window (widget).
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6804 * column: Zero based column.
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6805 */
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6806 int API dw_filesystem_get_column_type(HWND handle, int column)
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6807 {
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6808 return dw_container_get_column_type( handle, column + 1 );
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6809 }
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6810
078a40ba2e41 Added dw_container_get_column_type and dw_filesystem_get_column_type. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 507 diff changeset	6811 /*
22 6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6812 * Sets the width of a column in the container.
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6813 * Parameters:
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6814 * handle: Handle to window (widget) of container.
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6815 * column: Zero based column of width being set.
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6816 * width: Width of column in pixels.
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6817 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6818 void API dw_container_set_column_width(HWND handle, int column, int width)
22 6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6819 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6820 ListView_SetColumnWidth(handle, column, width);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6821 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6822
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6823 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6824 * Sets the title of a row in the container.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6825 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6826 * pointer: Pointer to the allocated memory in dw_container_alloc().
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6827 * row: Zero based row of data being set.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6828 * title: String title of the item.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6829 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6830 void API dw_container_set_row_title(void pointer, int row, char title)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6831 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6832 LV_ITEM lvi;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6833 HWND container = (HWND)pointer;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6834
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6835 lvi.iItem = row;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6836 lvi.iSubItem = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6837 lvi.mask = LVIF_PARAM;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6838 lvi.lParam = (LPARAM)title;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6839
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6840 if(!ListView_SetItem(container, &lvi) && lvi.lParam)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6841 lvi.lParam = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6842
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6843 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6844
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6845 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6846 * Sets the title of a row in the container.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6847 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6848 * handle: Handle to the container window (widget).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6849 * pointer: Pointer to the allocated memory in dw_container_alloc().
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6850 * rowcount: The number of rows to be inserted.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6851 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6852 void API dw_container_insert(HWND handle, void *pointer, int rowcount)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6853 {
79 8082cb0e7c2e Updated to the latest DW. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 75 diff changeset	6854 ShowWindow(handle, SW_SHOW);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6855 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6856
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6857 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6858 * Removes all rows from a container.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6859 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6860 * handle: Handle to the window (widget) to be cleared.
52 0804483f6320 Added a redraw parameter to dw_container_clear(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 49 diff changeset	6861 * redraw: TRUE to cause the container to redraw immediately.
0804483f6320 Added a redraw parameter to dw_container_clear(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 49 diff changeset	6862 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6863 void API dw_container_clear(HWND handle, int redraw)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6864 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6865 ListView_DeleteAllItems(handle);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6866 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6867
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6868 /*
22 6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6869 * Removes the first x rows from a container.
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6870 * Parameters:
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6871 * handle: Handle to the window (widget) to be deleted from.
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6872 * rowcount: The number of rows to be deleted.
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6873 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6874 void API dw_container_delete(HWND handle, int rowcount)
22 6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6875 {
496 33a266db534b Don't use globals for keeping track of dw_container_query() loops, allows bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 495 diff changeset	6876 int z, _index = (int)dw_window_get_data(handle, "_dw_index");
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6877
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6878 for(z=0;z<rowcount;z++)
22 6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6879 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6880 ListView_DeleteItem(handle, 0);
22 6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6881 }
495 477de19f14af Fixes for dw_container_delete() so they don't interfere with a pending bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 490 diff changeset	6882 if(rowcount > _index)
496 33a266db534b Don't use globals for keeping track of dw_container_query() loops, allows bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 495 diff changeset	6883 dw_window_set_data(handle, "_dw_index", 0);
495 477de19f14af Fixes for dw_container_delete() so they don't interfere with a pending bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 490 diff changeset	6884 else
496 33a266db534b Don't use globals for keeping track of dw_container_query() loops, allows bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 495 diff changeset	6885 dw_window_set_data(handle, "_dw_index", (void *)(_index - rowcount));
22 6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6886 }
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6887
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6888 /*
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6889 * Scrolls container up or down.
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6890 * Parameters:
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6891 * handle: Handle to the window (widget) to be scrolled.
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6892 * direction: DW_SCROLL_UP, DW_SCROLL_DOWN, DW_SCROLL_TOP or
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6893 * DW_SCROLL_BOTTOM. (rows is ignored for last two)
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6894 * rows: The number of rows to be scrolled.
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6895 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6896 void API dw_container_scroll(HWND handle, int direction, long rows)
22 6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6897 {
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6898 switch(direction)
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6899 {
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6900 case DW_SCROLL_TOP:
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6901 ListView_Scroll(handle, 0, -10000000);
22 6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6902 break;
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6903 case DW_SCROLL_BOTTOM:
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6904 ListView_Scroll(handle, 0, 10000000);
22 6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6905 break;
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6906 }
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6907 }
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6908
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6909 /*
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6910 * Starts a new query of a container.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6911 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6912 * handle: Handle to the window (widget) to be queried.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6913 * flags: If this parameter is DW_CRA_SELECTED it will only
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6914 * return items that are currently selected. Otherwise
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6915 * it will return all records in the container.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6916 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6917 char * API dw_container_query_start(HWND handle, unsigned long flags)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6918 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6919 LV_ITEM lvi;
496 33a266db534b Don't use globals for keeping track of dw_container_query() loops, allows bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 495 diff changeset	6920 int _index = ListView_GetNextItem(handle, -1, flags);
69 9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6921
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6922 if(_index == -1)
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6923 return NULL;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6924
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6925 memset(&lvi, 0, sizeof(LV_ITEM));
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6926
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6927 lvi.iItem = _index;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6928 lvi.mask = LVIF_PARAM;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6929
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6930 ListView_GetItem(handle, &lvi);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6931
496 33a266db534b Don't use globals for keeping track of dw_container_query() loops, allows bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 495 diff changeset	6932 dw_window_set_data(handle, "_dw_index", (void *)_index);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6933 return (char *)lvi.lParam;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6934 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6935
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6936 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6937 * Continues an existing query of a container.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6938 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6939 * handle: Handle to the window (widget) to be queried.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6940 * flags: If this parameter is DW_CRA_SELECTED it will only
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6941 * return items that are currently selected. Otherwise
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6942 * it will return all records in the container.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6943 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6944 char * API dw_container_query_next(HWND handle, unsigned long flags)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6945 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6946 LV_ITEM lvi;
496 33a266db534b Don't use globals for keeping track of dw_container_query() loops, allows bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 495 diff changeset	6947 int _index = (int)dw_window_get_data(handle, "_dw_index");
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6948
69 9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6949 _index = ListView_GetNextItem(handle, _index, flags);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6950
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6951 if(_index == -1)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6952 return NULL;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6953
69 9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6954 memset(&lvi, 0, sizeof(LV_ITEM));
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6955
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6956 lvi.iItem = _index;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6957 lvi.mask = LVIF_PARAM;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6958
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6959 ListView_GetItem(handle, &lvi);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6960
496 33a266db534b Don't use globals for keeping track of dw_container_query() loops, allows bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 495 diff changeset	6961 dw_window_set_data(handle, "_dw_index", (void *)_index);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6962 return (char *)lvi.lParam;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6963 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6964
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6965 /*
69 9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6966 * Cursors the item with the text speficied, and scrolls to that item.
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6967 * Parameters:
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6968 * handle: Handle to the window (widget) to be queried.
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6969 * text: Text usually returned by dw_container_query().
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6970 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6971 void API dw_container_cursor(HWND handle, char *text)
69 9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6972 {
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6973 int index = ListView_GetNextItem(handle, -1, LVNI_ALL);
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6974
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6975 while(index != -1)
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6976 {
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6977 LV_ITEM lvi;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6978
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6979 memset(&lvi, 0, sizeof(LV_ITEM));
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6980
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6981 lvi.iItem = index;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6982 lvi.mask = LVIF_PARAM;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6983
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6984 ListView_GetItem(handle, &lvi);
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6985
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6986 if((char *)lvi.lParam == text)
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6987 {
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6988 RECT viewport, item;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6989
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6990 ListView_SetItemState(handle, index, LVIS_FOCUSED \| LVIS_SELECTED, LVIS_FOCUSED \| LVIS_SELECTED);
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6991 ListView_EnsureVisible(handle, index, TRUE);
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6992 return;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6993 }
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6994
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6995 index = ListView_GetNextItem(handle, index, LVNI_ALL);
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6996 }
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6997 }
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6998
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6999 /*
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	7000 * Deletes the item with the text speficied.
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	7001 * Parameters:
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	7002 * handle: Handle to the window (widget).
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	7003 * text: Text usually returned by dw_container_query().
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	7004 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7005 void API dw_container_delete_row(HWND handle, char *text)
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	7006 {
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	7007 int index = ListView_GetNextItem(handle, -1, LVNI_ALL);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	7008
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	7009 while(index != -1)
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	7010 {
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	7011 LV_ITEM lvi;
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	7012
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	7013 memset(&lvi, 0, sizeof(LV_ITEM));
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	7014
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	7015 lvi.iItem = index;
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	7016 lvi.mask = LVIF_PARAM;
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	7017
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	7018 ListView_GetItem(handle, &lvi);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	7019
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	7020 if((char *)lvi.lParam == text)
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	7021 {
496 33a266db534b Don't use globals for keeping track of dw_container_query() loops, allows bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 495 diff changeset	7022 int _index = (int)dw_window_get_data(handle, "_dw_index");
33a266db534b Don't use globals for keeping track of dw_container_query() loops, allows bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 495 diff changeset	7023
495 477de19f14af Fixes for dw_container_delete() so they don't interfere with a pending bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 490 diff changeset	7024 if(index < _index)
496 33a266db534b Don't use globals for keeping track of dw_container_query() loops, allows bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 495 diff changeset	7025 dw_window_set_data(handle, "_dw_index", (void *)(_index - 1));
495 477de19f14af Fixes for dw_container_delete() so they don't interfere with a pending bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 490 diff changeset	7026
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	7027 ListView_DeleteItem(handle, index);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	7028 return;
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	7029 }
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	7030
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	7031 index = ListView_GetNextItem(handle, index, LVNI_ALL);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	7032 }
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	7033 }
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	7034
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	7035 /*
69 9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7036 * Optimizes the column widths so that all data is visible.
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7037 * Parameters:
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7038 * handle: Handle to the window (widget) to be optimized.
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7039 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7040 void API dw_container_optimize(HWND handle)
69 9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7041 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	7042 ContainerInfo cinfo = (ContainerInfo )GetWindowLongPtr(handle, GWLP_USERDATA);
69 9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7043 ULONG *flags;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7044 LV_ITEM lvi;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7045
102 372a7581b312 Minor changes to the container code on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 95 diff changeset	7046 if(cinfo && cinfo->columns == 1)
372a7581b312 Minor changes to the container code on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 95 diff changeset	7047 {
372a7581b312 Minor changes to the container code on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 95 diff changeset	7048 ListView_SetColumnWidth(handle, 0, LVSCW_AUTOSIZE);
372a7581b312 Minor changes to the container code on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 95 diff changeset	7049 }
372a7581b312 Minor changes to the container code on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 95 diff changeset	7050 else if(cinfo && cinfo->columns > 1)
69 9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7051 {
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7052 int z, index;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7053 ULONG flags = cinfo->flags, columns = calloc(sizeof(ULONG), cinfo->columns);
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7054 char *text = malloc(1024);
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7055
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7056 /* Initialize with sizes of column labels */
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7057 for(z=0;z<cinfo->columns;z++)
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7058 {
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7059 if(flags[z] & DW_CFA_BITMAPORICON)
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7060 columns[z] = 5;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7061 else
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7062 {
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7063 LVCOLUMN lvc;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7064
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7065 lvc.mask = LVCF_TEXT;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7066 lvc.cchTextMax = 1023;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7067 lvc.pszText = text;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7068
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7069 if(ListView_GetColumn(handle, z, &lvc))
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7070 columns[z] = ListView_GetStringWidth(handle, lvc.pszText);
105 ad95fc623ff3 Some changes to the container optimization code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 104 diff changeset	7071
ad95fc623ff3 Some changes to the container optimization code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 104 diff changeset	7072 if(flags[z] & DW_CFA_RESERVED)
ad95fc623ff3 Some changes to the container optimization code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 104 diff changeset	7073 columns[z] += 20;
69 9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7074 }
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7075 }
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7076
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7077 index = ListView_GetNextItem(handle, -1, LVNI_ALL);
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7078
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7079 /* Query all the item texts */
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7080 while(index != -1)
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7081 {
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7082 for(z=0;z<cinfo->columns;z++)
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7083 {
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7084 LV_ITEM lvi;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7085
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7086 memset(&lvi, 0, sizeof(LV_ITEM));
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7087
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7088 lvi.iItem = index;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7089 lvi.iSubItem = z;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7090 lvi.mask = LVIF_TEXT;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7091 lvi.cchTextMax = 1023;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7092 lvi.pszText = text;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7093
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7094 if(ListView_GetItem(handle, &lvi))
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7095 {
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7096 int width = ListView_GetStringWidth(handle, lvi.pszText);
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7097 if(width > columns[z])
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7098 {
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7099 if(z == 0)
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7100 columns[z] = width + 20;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7101 else
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7102 columns[z] = width;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7103 }
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7104 }
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7105 }
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7106
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7107 index = ListView_GetNextItem(handle, index, LVNI_ALL);
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7108 }
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7109
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7110 /* Set the new sizes */
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7111 for(z=0;z<cinfo->columns;z++)
71 291c30a92b9b Fixed a bug where if dw_filesystem_* was used then the last column bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 69 diff changeset	7112 ListView_SetColumnWidth(handle, z, columns[z] + 16);
69 9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7113
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7114 free(columns);
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7115 free(text);
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7116 }
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7117 }
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7118
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	7119 /*
487 d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7120 * Inserts an icon into the taskbar.
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7121 * Parameters:
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7122 * handle: Window handle that will handle taskbar icon messages.
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7123 * icon: Icon handle to display in the taskbar.
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7124 * bubbletext: Text to show when the mouse is above the icon.
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7125 */
507 c607eb385e58 Added missing calling conventions. Thanks Bastian for pointing this out. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 506 diff changeset	7126 void API dw_taskbar_insert(HWND handle, unsigned long icon, char *bubbletext)
487 d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7127 {
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7128 NOTIFYICONDATA tnid;
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7129
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7130 tnid.cbSize = sizeof(NOTIFYICONDATA);
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7131 tnid.hWnd = handle;
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7132 tnid.uID = icon;
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7133 tnid.uFlags = NIF_MESSAGE \| NIF_ICON \| NIF_TIP;
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7134 tnid.uCallbackMessage = WM_USER+2;
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7135 tnid.hIcon = (HICON)icon;
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7136 if(bubbletext)
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7137 strncpy(tnid.szTip, bubbletext, sizeof(tnid.szTip));
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7138 else
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7139 tnid.szTip[0] = 0;
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7140
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7141 Shell_NotifyIcon(NIM_ADD, &tnid);
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7142 }
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7143
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7144 /*
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7145 * Deletes an icon from the taskbar.
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7146 * Parameters:
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7147 * handle: Window handle that was used with dw_taskbar_insert().
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7148 * icon: Icon handle that was used with dw_taskbar_insert().
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7149 */
507 c607eb385e58 Added missing calling conventions. Thanks Bastian for pointing this out. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 506 diff changeset	7150 void API dw_taskbar_delete(HWND handle, unsigned long icon)
487 d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7151 {
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7152 NOTIFYICONDATA tnid;
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7153
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7154 tnid.cbSize = sizeof(NOTIFYICONDATA);
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7155 tnid.hWnd = handle;
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7156 tnid.uID = icon;
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7157
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7158 Shell_NotifyIcon(NIM_DELETE, &tnid);
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7159 }
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7160
d6e07d292145 Implemented taskbar icons on windows, so I can keep feature for feature bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 481 diff changeset	7161 /*
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7162 * Creates a rendering context widget (window) to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7163 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7164 * id: An id to be used with dw_window_from_id.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7165 * Returns:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7166 * A handle to the widget or NULL on failure.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7167 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7168 HWND API dw_render_new(unsigned long id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7169 {
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	7170 Box *newbox = calloc(sizeof(Box), 1);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7171 HWND tmp = CreateWindow(ObjectClassName,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7172 "",
107 cd0e5cf92f6a Rewrote the Windows packing code so it is more like OS/2 to improve window bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 106 diff changeset	7173 WS_VISIBLE \| WS_CHILD \| WS_CLIPCHILDREN,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7174 0,0,2000,1000,
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7175 DW_HWND_OBJECT,
119 1cad81b7cc4c Implemented initial splitbar code on Unix. And made some fixes for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 118 diff changeset	7176 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	7177 DWInstance,
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7178 NULL);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7179 newbox->pad = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7180 newbox->type = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7181 newbox->count = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7182 newbox->grouphwnd = (HWND)NULL;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7183 newbox->cinfo.pOldProc = SubclassWindow(tmp, _rendwndproc);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7184 newbox->cinfo.fore = newbox->cinfo.back = -1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7185
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	7186 SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)newbox);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7187 return tmp;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7188 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7189
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7190 /* Sets the current foreground drawing color.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7191 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7192 * red: red value.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7193 * green: green value.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7194 * blue: blue value.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7195 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7196 void API dw_color_foreground_set(unsigned long value)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7197 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7198 int threadid = dw_thread_id();
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7199
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7200 if(threadid < 0 \|\| threadid >= THREAD_LIMIT)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7201 threadid = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7202
191 634625c3239d Fixes for dw_color_xxxx_set() to accept OS/2 style colors, and fixed a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 185 diff changeset	7203 value = _internal_color(value);
634625c3239d Fixes for dw_color_xxxx_set() to accept OS/2 style colors, and fixed a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 185 diff changeset	7204
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7205 DeleteObject(_hPen[threadid]);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7206 DeleteObject(_hBrush[threadid]);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7207 _foreground[threadid] = RGB(DW_RED_VALUE(value), DW_GREEN_VALUE(value), DW_BLUE_VALUE(value));
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7208 _hPen[threadid] = CreatePen(PS_SOLID, 1, _foreground[threadid]);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7209 _hBrush[threadid] = CreateSolidBrush(_foreground[threadid]);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7210 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7211
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7212 /* Sets the current background drawing color.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7213 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7214 * red: red value.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7215 * green: green value.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7216 * blue: blue value.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7217 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7218 void API dw_color_background_set(unsigned long value)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7219 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7220 int threadid = dw_thread_id();
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7221
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7222 if(threadid < 0 \|\| threadid >= THREAD_LIMIT)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7223 threadid = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7224
191 634625c3239d Fixes for dw_color_xxxx_set() to accept OS/2 style colors, and fixed a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 185 diff changeset	7225 value = _internal_color(value);
634625c3239d Fixes for dw_color_xxxx_set() to accept OS/2 style colors, and fixed a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 185 diff changeset	7226
370 e5156e7e5f19 Fixes for background set to DW_CLR_DEFAULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 369 diff changeset	7227 if(value == DW_RGB_TRANSPARENT)
e5156e7e5f19 Fixes for background set to DW_CLR_DEFAULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 369 diff changeset	7228 _background[threadid] = DW_RGB_TRANSPARENT;
e5156e7e5f19 Fixes for background set to DW_CLR_DEFAULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 369 diff changeset	7229 else
e5156e7e5f19 Fixes for background set to DW_CLR_DEFAULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 369 diff changeset	7230 _background[threadid] = RGB(DW_RED_VALUE(value), DW_GREEN_VALUE(value), DW_BLUE_VALUE(value));
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7231 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7232
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7233 /* Draw a point on a window (preferably a render window).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7234 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7235 * handle: Handle to the window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7236 * pixmap: Handle to the pixmap. (choose only one of these)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7237 * x: X coordinate.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7238 * y: Y coordinate.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7239 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7240 void API dw_draw_point(HWND handle, HPIXMAP pixmap, int x, int y)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7241 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7242 HDC hdcPaint;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7243 int threadid = dw_thread_id();
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7244
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7245 if(threadid < 0 \|\| threadid >= THREAD_LIMIT)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7246 threadid = 0;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7247
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7248 if(handle)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7249 hdcPaint = GetDC(handle);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7250 else if(pixmap)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7251 hdcPaint = pixmap->hdc;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7252 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7253 return;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7254
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7255 SetPixel(hdcPaint, x, y, _foreground[threadid]);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7256 if(!pixmap)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7257 ReleaseDC(handle, hdcPaint);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7258 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7259
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7260 /* Draw a line on a window (preferably a render window).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7261 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7262 * handle: Handle to the window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7263 * pixmap: Handle to the pixmap. (choose only one of these)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7264 * x1: First X coordinate.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7265 * y1: First Y coordinate.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7266 * x2: Second X coordinate.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7267 * y2: Second Y coordinate.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7268 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7269 void API dw_draw_line(HWND handle, HPIXMAP pixmap, int x1, int y1, int x2, int y2)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7270 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7271 HDC hdcPaint;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7272 HPEN oldPen;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7273 int threadid = dw_thread_id();
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7274
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7275 if(threadid < 0 \|\| threadid >= THREAD_LIMIT)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7276 threadid = 0;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7277
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7278 if(handle)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7279 hdcPaint = GetDC(handle);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7280 else if(pixmap)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7281 hdcPaint = pixmap->hdc;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7282 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7283 return;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7284
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7285 oldPen = SelectObject(hdcPaint, _hPen[threadid]);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7286 MoveToEx(hdcPaint, x1, y1, NULL);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7287 LineTo(hdcPaint, x2, y2);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7288 SelectObject(hdcPaint, oldPen);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7289 /* For some reason Win98 (at least) fails
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7290 * to draw the last pixel. So I do it myself.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7291 */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7292 SetPixel(hdcPaint, x2, y2, _foreground[threadid]);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7293 if(!pixmap)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7294 ReleaseDC(handle, hdcPaint);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7295 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7296
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7297 /* Draw a rectangle on a window (preferably a render window).
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7298 * Parameters:
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7299 * handle: Handle to the window.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7300 * pixmap: Handle to the pixmap. (choose only one of these)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7301 * x: X coordinate.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7302 * y: Y coordinate.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7303 * width: Width of rectangle.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7304 * height: Height of rectangle.
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7305 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7306 void API dw_draw_rect(HWND handle, HPIXMAP pixmap, int fill, int x, int y, int width, int height)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7307 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7308 HDC hdcPaint;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7309 HPEN oldPen;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7310 HBRUSH oldBrush;
436 98d6c00fe11e Fix bug with specifying fonts with modifiers; the modifiers were not being mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 429 diff changeset	7311 RECT Rect;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7312 int threadid = dw_thread_id();
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7313
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7314 if(threadid < 0 \|\| threadid >= THREAD_LIMIT)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7315 threadid = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7316
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7317 if(handle)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7318 hdcPaint = GetDC(handle);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7319 else if(pixmap)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7320 hdcPaint = pixmap->hdc;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7321 else
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7322 return;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7323
436 98d6c00fe11e Fix bug with specifying fonts with modifiers; the modifiers were not being mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 429 diff changeset	7324 SetRect(&Rect, x, y, x + width , y + height );
98d6c00fe11e Fix bug with specifying fonts with modifiers; the modifiers were not being mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 429 diff changeset	7325 if(fill)
98d6c00fe11e Fix bug with specifying fonts with modifiers; the modifiers were not being mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 429 diff changeset	7326 FillRect(hdcPaint, &Rect, _hBrush[threadid]);
98d6c00fe11e Fix bug with specifying fonts with modifiers; the modifiers were not being mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 429 diff changeset	7327 else
98d6c00fe11e Fix bug with specifying fonts with modifiers; the modifiers were not being mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 429 diff changeset	7328 FrameRect(hdcPaint, &Rect, _hBrush[threadid]);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7329 if(!pixmap)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7330 ReleaseDC(handle, hdcPaint);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7331 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7332
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7333 /* Draw text on a window (preferably a render window).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7334 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7335 * handle: Handle to the window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7336 * pixmap: Handle to the pixmap. (choose only one of these)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7337 * x: X coordinate.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7338 * y: Y coordinate.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7339 * text: Text to be displayed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7340 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7341 void API dw_draw_text(HWND handle, HPIXMAP pixmap, int x, int y, char *text)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7342 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7343 HDC hdc;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7344 int size = 9, z, mustdelete = 0;
455 dd04a4d781f8 Fixes GDI font object leak when calling dw_window_set_font() on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 454 diff changeset	7345 HFONT hFont = 0, oldFont = 0;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7346 int threadid = dw_thread_id();
455 dd04a4d781f8 Fixes GDI font object leak when calling dw_window_set_font() on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 454 diff changeset	7347 ColorInfo *cinfo;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7348
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7349 if(threadid < 0 \|\| threadid >= THREAD_LIMIT)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7350 threadid = 0;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7351
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7352 if(handle)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7353 hdc = GetDC(handle);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7354 else if(pixmap)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7355 hdc = pixmap->hdc;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7356 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7357 return;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7358
455 dd04a4d781f8 Fixes GDI font object leak when calling dw_window_set_font() on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 454 diff changeset	7359 if(handle)
dd04a4d781f8 Fixes GDI font object leak when calling dw_window_set_font() on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 454 diff changeset	7360 cinfo = (ColorInfo *)GetWindowLongPtr(handle, GWLP_USERDATA);
dd04a4d781f8 Fixes GDI font object leak when calling dw_window_set_font() on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 454 diff changeset	7361 else
dd04a4d781f8 Fixes GDI font object leak when calling dw_window_set_font() on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 454 diff changeset	7362 cinfo = (ColorInfo *)GetWindowLongPtr(pixmap->handle, GWLP_USERDATA);
dd04a4d781f8 Fixes GDI font object leak when calling dw_window_set_font() on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 454 diff changeset	7363
dd04a4d781f8 Fixes GDI font object leak when calling dw_window_set_font() on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 454 diff changeset	7364 if(cinfo)
dd04a4d781f8 Fixes GDI font object leak when calling dw_window_set_font() on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 454 diff changeset	7365 {
dd04a4d781f8 Fixes GDI font object leak when calling dw_window_set_font() on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 454 diff changeset	7366 hFont = _acquire_font(handle, cinfo->fontname);
dd04a4d781f8 Fixes GDI font object leak when calling dw_window_set_font() on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 454 diff changeset	7367 mustdelete = 1;
dd04a4d781f8 Fixes GDI font object leak when calling dw_window_set_font() on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 454 diff changeset	7368 }
dd04a4d781f8 Fixes GDI font object leak when calling dw_window_set_font() on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 454 diff changeset	7369
dd04a4d781f8 Fixes GDI font object leak when calling dw_window_set_font() on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 454 diff changeset	7370 if(hFont)
dd04a4d781f8 Fixes GDI font object leak when calling dw_window_set_font() on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 454 diff changeset	7371 oldFont = SelectObject(hdc, hFont);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7372 SetTextColor(hdc, _foreground[threadid]);
369 39983df2b93d Updated the license information, and copyrights. Code to do background bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 355 diff changeset	7373 if(_background[threadid] == DW_RGB_TRANSPARENT)
39983df2b93d Updated the license information, and copyrights. Code to do background bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 355 diff changeset	7374 SetBkMode(hdc, TRANSPARENT);
39983df2b93d Updated the license information, and copyrights. Code to do background bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 355 diff changeset	7375 else
39983df2b93d Updated the license information, and copyrights. Code to do background bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 355 diff changeset	7376 {
39983df2b93d Updated the license information, and copyrights. Code to do background bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 355 diff changeset	7377 SetBkMode(hdc, OPAQUE);
39983df2b93d Updated the license information, and copyrights. Code to do background bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 355 diff changeset	7378 SetBkColor(hdc, _background[threadid]);
39983df2b93d Updated the license information, and copyrights. Code to do background bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 355 diff changeset	7379 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7380 TextOut(hdc, x, y, text, strlen(text));
455 dd04a4d781f8 Fixes GDI font object leak when calling dw_window_set_font() on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 454 diff changeset	7381 if(oldFont)
dd04a4d781f8 Fixes GDI font object leak when calling dw_window_set_font() on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 454 diff changeset	7382 SelectObject(hdc, oldFont);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7383 if(mustdelete)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7384 DeleteObject(hFont);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7385 if(!pixmap)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7386 ReleaseDC(handle, hdc);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7387 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7388
49 bf42d08d72d7 Added font text extent querying code, and made it so winmain.c can be used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 48 diff changeset	7389 /* Query the width and height of a text string.
bf42d08d72d7 Added font text extent querying code, and made it so winmain.c can be used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 48 diff changeset	7390 * Parameters:
bf42d08d72d7 Added font text extent querying code, and made it so winmain.c can be used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 48 diff changeset	7391 * handle: Handle to the window.
bf42d08d72d7 Added font text extent querying code, and made it so winmain.c can be used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 48 diff changeset	7392 * pixmap: Handle to the pixmap. (choose only one of these)
bf42d08d72d7 Added font text extent querying code, and made it so winmain.c can be used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 48 diff changeset	7393 * text: Text to be queried.
bf42d08d72d7 Added font text extent querying code, and made it so winmain.c can be used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 48 diff changeset	7394 * width: Pointer to a variable to be filled in with the width.
bf42d08d72d7 Added font text extent querying code, and made it so winmain.c can be used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 48 diff changeset	7395 * height Pointer to a variable to be filled in with the height.
bf42d08d72d7 Added font text extent querying code, and made it so winmain.c can be used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 48 diff changeset	7396 */
514 08d770271709 More function name changes for Rexx/DW compatibility. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 513 diff changeset	7397 void API dw_font_text_extents_get(HWND handle, HPIXMAP pixmap, char text, int width, int *height)
49 bf42d08d72d7 Added font text extent querying code, and made it so winmain.c can be used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 48 diff changeset	7398 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7399 HDC hdc;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7400 int mustdelete = 0;
88 58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	7401 HFONT hFont = NULL, oldFont;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7402 SIZE sz;
49 bf42d08d72d7 Added font text extent querying code, and made it so winmain.c can be used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 48 diff changeset	7403
bf42d08d72d7 Added font text extent querying code, and made it so winmain.c can be used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 48 diff changeset	7404 if(handle)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7405 hdc = GetDC(handle);
49 bf42d08d72d7 Added font text extent querying code, and made it so winmain.c can be used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 48 diff changeset	7406 else if(pixmap)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7407 hdc = pixmap->hdc;
49 bf42d08d72d7 Added font text extent querying code, and made it so winmain.c can be used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 48 diff changeset	7408 else
bf42d08d72d7 Added font text extent querying code, and made it so winmain.c can be used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 48 diff changeset	7409 return;
bf42d08d72d7 Added font text extent querying code, and made it so winmain.c can be used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 48 diff changeset	7410
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7411 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7412 ColorInfo *cinfo;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7413
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7414 if(handle)
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	7415 cinfo = (ColorInfo *)GetWindowLongPtr(handle, GWLP_USERDATA);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7416 else
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	7417 cinfo = (ColorInfo *)GetWindowLongPtr(pixmap->handle, GWLP_USERDATA);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7418
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7419 if(cinfo)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7420 {
67 ab9b0fa6c66e Focus fixes and removal of several hack in the OS/2 code base. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 63 diff changeset	7421 hFont = _acquire_font(handle, cinfo->fontname);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7422 mustdelete = 1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7423 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7424 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7425 oldFont = SelectObject(hdc, hFont);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7426
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7427 GetTextExtentPoint32(hdc, text, strlen(text), &sz);
49 bf42d08d72d7 Added font text extent querying code, and made it so winmain.c can be used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 48 diff changeset	7428
bf42d08d72d7 Added font text extent querying code, and made it so winmain.c can be used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 48 diff changeset	7429 if(width)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7430 *width = sz.cx;
49 bf42d08d72d7 Added font text extent querying code, and made it so winmain.c can be used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 48 diff changeset	7431
bf42d08d72d7 Added font text extent querying code, and made it so winmain.c can be used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 48 diff changeset	7432 if(height)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7433 *height = sz.cy;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7434
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7435 SelectObject(hdc, oldFont);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7436 if(mustdelete)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7437 DeleteObject(hFont);
49 bf42d08d72d7 Added font text extent querying code, and made it so winmain.c can be used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 48 diff changeset	7438 if(!pixmap)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7439 ReleaseDC(handle, hdc);
49 bf42d08d72d7 Added font text extent querying code, and made it so winmain.c can be used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 48 diff changeset	7440 }
bf42d08d72d7 Added font text extent querying code, and made it so winmain.c can be used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 48 diff changeset	7441
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7442 /* Call this after drawing to the screen to make sure
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7443 * anything you have drawn is visible.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7444 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7445 void API dw_flush(void)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7446 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7447 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7448
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7449 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7450 * Creates a pixmap with given parameters.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7451 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7452 * handle: Window handle the pixmap is associated with.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7453 * width: Width of the pixmap in pixels.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7454 * height: Height of the pixmap in pixels.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7455 * depth: Color depth of the pixmap.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7456 * Returns:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7457 * A handle to a pixmap or NULL on failure.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7458 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7459 HPIXMAP API dw_pixmap_new(HWND handle, unsigned long width, unsigned long height, int depth)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7460 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7461 HPIXMAP pixmap;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7462 BITMAP bm;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7463 HDC hdc;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7464
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7465 if (!(pixmap = calloc(1,sizeof(struct _hpixmap))))
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7466 return NULL;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7467
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7468 hdc = GetDC(handle);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7469
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7470 pixmap->width = width; pixmap->height = height;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7471
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7472 pixmap->handle = handle;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7473 pixmap->hbm = CreateCompatibleBitmap(hdc, width, height);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7474 pixmap->hdc = CreateCompatibleDC(hdc);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7475
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7476 SelectObject(pixmap->hdc, pixmap->hbm);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7477
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7478 ReleaseDC(handle, hdc);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7479
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7480 return pixmap;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7481 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7482
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7483 /*
241 00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7484 * Creates a pixmap from a file.
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7485 * Parameters:
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7486 * handle: Window handle the pixmap is associated with.
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7487 * filename: Name of the file, omit extention to have
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7488 * DW pick the appropriate file extension.
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7489 * (BMP on OS/2 or Windows, XPM on Unix)
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7490 * Returns:
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7491 * A handle to a pixmap or NULL on failure.
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7492 */
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7493 HPIXMAP API dw_pixmap_new_from_file(HWND handle, char *filename)
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7494 {
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7495 HPIXMAP pixmap;
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7496 BITMAP bm;
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7497 HDC hdc;
242 36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7498 char *file = malloc(strlen(filename) + 5);
241 00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7499
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7500 if (!file \|\| !(pixmap = calloc(1,sizeof(struct _hpixmap))))
242 36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7501 {
36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7502 if(file)
36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7503 free(file);
241 00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7504 return NULL;
242 36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7505 }
241 00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7506
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7507 strcpy(file, filename);
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7508
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7509 /* check if we can read from this file (it exists and read permission) */
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7510 if(access(file, 04) != 0)
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7511 {
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7512 /* Try with .bmp extention */
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7513 strcat(file, ".bmp");
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7514 if(access(file, 04) != 0)
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7515 {
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7516 free(pixmap);
242 36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7517 free(file);
241 00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7518 return NULL;
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7519 }
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7520 }
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7521
242 36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7522 hdc = GetDC(handle);
241 00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7523
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7524 pixmap->handle = handle;
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7525 pixmap->hbm = (HBITMAP)LoadImage(NULL, file, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE);
242 36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7526
36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7527 if(!pixmap->hbm)
36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7528 {
36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7529 free(file);
36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7530 free(pixmap);
36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7531 ReleaseDC(handle, hdc);
36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7532 return NULL;
36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7533 }
36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7534
241 00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7535 pixmap->hdc = CreateCompatibleDC(hdc);
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7536
243 3c1e39905f2f Use GetObject() instead of GetBitmapDimensionEx() to get the loaded bitmap bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 242 diff changeset	7537 GetObject(pixmap->hbm, sizeof(bm), &bm);
3c1e39905f2f Use GetObject() instead of GetBitmapDimensionEx() to get the loaded bitmap bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 242 diff changeset	7538
3c1e39905f2f Use GetObject() instead of GetBitmapDimensionEx() to get the loaded bitmap bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 242 diff changeset	7539 pixmap->width = bm.bmWidth; pixmap->height = bm.bmHeight;
242 36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7540
241 00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7541 SelectObject(pixmap->hdc, pixmap->hbm);
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7542
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7543 ReleaseDC(handle, hdc);
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7544
242 36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7545 free(file);
36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7546
241 00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7547 return pixmap;
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7548 }
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7549
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7550 /*
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7551 * Creates a pixmap from internal resource graphic specified by id.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7552 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7553 * handle: Window handle the pixmap is associated with.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7554 * id: Resource ID associated with requested pixmap.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7555 * Returns:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7556 * A handle to a pixmap or NULL on failure.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7557 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7558 HPIXMAP API dw_pixmap_grab(HWND handle, ULONG id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7559 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7560 HPIXMAP pixmap;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7561 BITMAP bm;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7562 HDC hdc;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7563
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7564 if (!(pixmap = calloc(1,sizeof(struct _hpixmap))))
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7565 return NULL;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7566
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7567 hdc = GetDC(handle);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7568
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7569
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7570 pixmap->hbm = LoadBitmap(DWInstance, MAKEINTRESOURCE(id));
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7571 pixmap->hdc = CreateCompatibleDC(hdc);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7572
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7573 GetObject(pixmap->hbm, sizeof(BITMAP), (void *)&bm);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7574
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7575 pixmap->width = bm.bmWidth; pixmap->height = bm.bmHeight;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7576
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7577 SelectObject(pixmap->hdc, pixmap->hbm);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7578
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7579 ReleaseDC(handle, hdc);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7580
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7581 return pixmap;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7582 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7583
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7584 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7585 * Destroys an allocated pixmap.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7586 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7587 * pixmap: Handle to a pixmap returned by
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7588 * dw_pixmap_new..
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7589 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7590 void API dw_pixmap_destroy(HPIXMAP pixmap)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7591 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7592 if(pixmap)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7593 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7594 DeleteDC(pixmap->hdc);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7595 DeleteObject(pixmap->hbm);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7596 free(pixmap);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7597 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7598 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7599
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7600 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7601 * Copies from one item to another.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7602 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7603 * dest: Destination window handle.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7604 * destp: Destination pixmap. (choose only one).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7605 * xdest: X coordinate of destination.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7606 * ydest: Y coordinate of destination.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7607 * width: Width of area to copy.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7608 * height: Height of area to copy.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7609 * src: Source window handle.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7610 * srcp: Source pixmap. (choose only one).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7611 * xsrc: X coordinate of source.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7612 * ysrc: Y coordinate of source.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7613 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7614 void API dw_pixmap_bitblt(HWND dest, HPIXMAP destp, int xdest, int ydest, int width, int height, HWND src, HPIXMAP srcp, int xsrc, int ysrc)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7615 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7616 HDC hdcdest;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7617 HDC hdcsrc;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7618
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7619 if(dest)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7620 hdcdest = GetDC(dest);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7621 else if(destp)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7622 hdcdest = destp->hdc;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7623 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7624 return;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7625
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7626 if(src)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7627 hdcsrc = GetDC(src);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7628 else if(srcp)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7629 hdcsrc = srcp->hdc;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7630 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7631 return;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7632
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7633 BitBlt(hdcdest, xdest, ydest, width, height, hdcsrc, xsrc, ysrc, SRCCOPY);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7634
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7635 if(!destp)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7636 ReleaseDC(dest, hdcdest);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7637 if(!srcp)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7638 ReleaseDC(src, hdcsrc);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7639 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7640
527 e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	7641 /* Run Beep() in a separate thread so it doesn't block */
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	7642 void _beepthread(void *data)
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	7643 {
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	7644 int info = (int )data;
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	7645
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	7646 if(data)
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	7647 {
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	7648 Beep(info[0], info[1]);
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	7649 free(data);
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	7650 }
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	7651 }
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	7652
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7653 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7654 * Emits a beep.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7655 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7656 * freq: Frequency.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7657 * dur: Duration.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7658 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7659 void API dw_beep(int freq, int dur)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7660 {
527 e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	7661 int info = malloc(sizeof(int) 2);
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	7662
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	7663 if(info)
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	7664 {
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	7665 info[0] = freq;
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	7666 info[1] = dur;
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	7667
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	7668 _beginthread(_beepthread, 100, (void *)info);
e0ea29c3d1eb Fixed dw_window_pointer() so it works on Windows. Tried to fix the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 526 diff changeset	7669 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7670 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7671
157 a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7672 /* Open a shared library and return a handle.
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7673 * Parameters:
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7674 * name: Base name of the shared library.
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7675 * handle: Pointer to a module handle,
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7676 * will be filled in with the handle.
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7677 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7678 int API dw_module_load(char name, HMOD handle)
157 a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7679 {
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7680 if(!handle)
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7681 return -1;
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7682
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7683 *handle = LoadLibrary(name);
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7684 return (NULL == *handle);
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7685 }
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7686
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7687 /* Queries the address of a symbol within open handle.
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7688 * Parameters:
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7689 * handle: Module handle returned by dw_module_load()
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7690 * name: Name of the symbol you want the address of.
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7691 * func: A pointer to a function pointer, to obtain
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7692 * the address.
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7693 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7694 int API dw_module_symbol(HMOD handle, char name, void*func)
157 a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7695 {
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7696 if(!func \|\| !name)
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7697 return -1;
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7698
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7699 if(0 == strlen(name))
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7700 return -1;
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7701
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7702 func = (void)GetProcAddress(handle, name);
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7703 return (NULL == *func);
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7704 }
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7705
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7706 /* Frees the shared library previously opened.
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7707 * Parameters:
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7708 * handle: Module handle returned by dw_module_load()
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7709 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7710 int API dw_module_close(HMOD handle)
157 a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7711 {
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7712 return FreeLibrary(handle);
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7713 }
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7714
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7715 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7716 * Returns the handle to an unnamed mutex semaphore.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7717 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7718 HMTX API dw_mutex_new(void)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7719 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7720 return (HMTX)CreateMutex(NULL, FALSE, NULL);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7721 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7722
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7723 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7724 * Closes a semaphore created by dw_mutex_new().
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7725 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7726 * mutex: The handle to the mutex returned by dw_mutex_new().
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7727 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7728 void API dw_mutex_close(HMTX mutex)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7729 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7730 CloseHandle((HANDLE)mutex);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7731 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7732
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7733 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7734 * Tries to gain access to the semaphore, if it can't it blocks.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7735 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7736 * mutex: The handle to the mutex returned by dw_mutex_new().
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7737 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7738 void API dw_mutex_lock(HMTX mutex)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7739 {
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	7740 if(_dwtid == dw_thread_id())
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	7741 {
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	7742 int rc = WaitForSingleObject((HANDLE)mutex, 0);
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	7743
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	7744 while(rc == WAIT_TIMEOUT)
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	7745 {
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	7746 dw_main_sleep(1);
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	7747 rc = WaitForSingleObject((HANDLE)mutex, 0);
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	7748 }
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	7749 }
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	7750 else
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	7751 WaitForSingleObject((HANDLE)mutex, INFINITE);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7752 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7753
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7754 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7755 * Reliquishes the access to the semaphore.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7756 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7757 * mutex: The handle to the mutex returned by dw_mutex_new().
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7758 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7759 void API dw_mutex_unlock(HMTX mutex)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7760 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7761 ReleaseMutex((HANDLE)mutex);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7762 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7763
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7764 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7765 * Returns the handle to an unnamed event semaphore.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7766 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7767 HEV API dw_event_new(void)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7768 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7769 return CreateEvent(NULL, TRUE, FALSE, NULL);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7770 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7771
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7772 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7773 * Resets a semaphore created by dw_event_new().
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7774 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7775 * eve: The handle to the event returned by dw_event_new().
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7776 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7777 int API dw_event_reset(HEV eve)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7778 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7779 return ResetEvent(eve);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7780 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7781
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7782 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7783 * Posts a semaphore created by dw_event_new(). Causing all threads
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7784 * waiting on this event in dw_event_wait to continue.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7785 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7786 * eve: The handle to the event returned by dw_event_new().
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7787 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7788 int API dw_event_post(HEV eve)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7789 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7790 return SetEvent(eve);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7791 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7792
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7793 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7794 * Waits on a semaphore created by dw_event_new(), until the
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7795 * event gets posted or until the timeout expires.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7796 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7797 * eve: The handle to the event returned by dw_event_new().
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7798 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7799 int API dw_event_wait(HEV eve, unsigned long timeout)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7800 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7801 int rc;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7802
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7803 rc = WaitForSingleObject(eve, timeout);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7804 if(rc == WAIT_OBJECT_0)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7805 return 1;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7806 if(rc == WAIT_ABANDONED)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7807 return -1;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7808 return 0;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7809 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7810
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7811 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7812 * Closes a semaphore created by dw_event_new().
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7813 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7814 * eve: The handle to the event returned by dw_event_new().
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7815 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7816 int API dw_event_close(HEV *eve)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7817 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7818 if(eve)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7819 return CloseHandle(*eve);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7820 return FALSE;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7821 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7822
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7823 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7824 * Creates a new thread with a starting point of func.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7825 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7826 * func: Function which will be run in the new thread.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7827 * data: Parameter(s) passed to the function.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7828 * stack: Stack size of new thread (OS/2 and Windows only).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7829 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7830 DWTID API dw_thread_new(void func, void data, int stack)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7831 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7832 #if defined(__CYGWIN__)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7833 return 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7834 #else
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7835 return (DWTID)_beginthread((void()(void ))func, stack, data);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7836 #endif
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7837 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7838
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7839 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7840 * Ends execution of current thread immediately.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7841 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7842 void API dw_thread_end(void)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7843 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7844 #if !defined(__CYGWIN__)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7845 _endthread();
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7846 #endif
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7847 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7848
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7849 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7850 * Returns the current thread's ID.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7851 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7852 DWTID API dw_thread_id(void)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7853 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7854 #if defined(__CYGWIN__)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7855 return 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7856 #else
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7857 return (DWTID)GetCurrentThreadId();
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7858 #endif
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7859 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7860
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7861 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7862 * Cleanly terminates a DW session, should be signal handler safe.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7863 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7864 * exitcode: Exit code reported to the operating system.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7865 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7866 void API dw_exit(int exitcode)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7867 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7868 exit(exitcode);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7869 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7870
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7871 /*
118 c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7872 * Creates a splitbar window (widget) with given parameters.
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7873 * Parameters:
283 54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	7874 * type: Value can be DW_VERT or DW_HORZ.
118 c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7875 * topleft: Handle to the window to be top or left.
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7876 * bottomright: Handle to the window to be bottom or right.
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7877 * Returns:
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7878 * A handle to a splitbar window or NULL on failure.
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7879 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7880 HWND API dw_splitbar_new(int type, HWND topleft, HWND bottomright, unsigned long id)
118 c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7881 {
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7882 HWND tmp = CreateWindow(SplitbarClassName,
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7883 "",
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7884 WS_VISIBLE \| WS_CHILD \| WS_CLIPCHILDREN,
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7885 0,0,2000,1000,
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7886 DW_HWND_OBJECT,
119 1cad81b7cc4c Implemented initial splitbar code on Unix. And made some fixes for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 118 diff changeset	7887 (HMENU)id,
118 c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7888 DWInstance,
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7889 NULL);
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7890
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7891 if(tmp)
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7892 {
283 54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	7893 HWND tmpbox = dw_box_new(DW_VERT, 0);
124 edf615d8266e Use float instead of int for percent on Windows. And a minor safety check bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 119 diff changeset	7894 float percent = (float )malloc(sizeof(float));
118 c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7895
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7896 dw_box_pack_start(tmpbox, topleft, 1, 1, TRUE, TRUE, 0);
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7897 SetParent(tmpbox, tmp);
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7898 dw_window_set_data(tmp, "_dw_topleft", (void *)tmpbox);
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7899
283 54aafc134652 BOXVERT is now DW_VERT and BOXHORZ is now DW_HORZ. Also code cleanups, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 281 diff changeset	7900 tmpbox = dw_box_new(DW_VERT, 0);
118 c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7901 dw_box_pack_start(tmpbox, bottomright, 1, 1, TRUE, TRUE, 0);
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7902 SetParent(tmpbox, tmp);
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7903 dw_window_set_data(tmp, "_dw_bottomright", (void *)tmpbox);
124 edf615d8266e Use float instead of int for percent on Windows. And a minor safety check bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 119 diff changeset	7904 *percent = 50.0;
edf615d8266e Use float instead of int for percent on Windows. And a minor safety check bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 119 diff changeset	7905 dw_window_set_data(tmp, "_dw_percent", (void *)percent);
118 c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7906 dw_window_set_data(tmp, "_dw_type", (void *)type);
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7907 }
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7908 return tmp;
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7909 }
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7910
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7911 /*
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7912 * Sets the position of a splitbar (pecentage).
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7913 * Parameters:
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7914 * handle: The handle to the splitbar returned by dw_splitbar_new().
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7915 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7916 void API dw_splitbar_set(HWND handle, float percent)
118 c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7917 {
124 edf615d8266e Use float instead of int for percent on Windows. And a minor safety check bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 119 diff changeset	7918 float mypercent = (float )dw_window_get_data(handle, "_dw_percent");
129 e47c52b37cdd Code cleanup and OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 127 diff changeset	7919 int type = (int)dw_window_get_data(handle, "_dw_type");
e47c52b37cdd Code cleanup and OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 127 diff changeset	7920 unsigned long width, height;
124 edf615d8266e Use float instead of int for percent on Windows. And a minor safety check bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 119 diff changeset	7921
edf615d8266e Use float instead of int for percent on Windows. And a minor safety check bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 119 diff changeset	7922 if(mypercent)
edf615d8266e Use float instead of int for percent on Windows. And a minor safety check bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 119 diff changeset	7923 *mypercent = percent;
129 e47c52b37cdd Code cleanup and OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 127 diff changeset	7924
e47c52b37cdd Code cleanup and OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 127 diff changeset	7925 dw_window_get_pos_size(handle, NULL, NULL, &width, &height);
e47c52b37cdd Code cleanup and OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 127 diff changeset	7926
e47c52b37cdd Code cleanup and OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 127 diff changeset	7927 _handle_splitbar_resize(handle, percent, type, width, height);
118 c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7928 }
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7929
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7930 /*
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7931 * Gets the position of a splitbar (pecentage).
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7932 * Parameters:
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7933 * handle: The handle to the splitbar returned by dw_splitbar_new().
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7934 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7935 float API dw_splitbar_get(HWND handle)
124 edf615d8266e Use float instead of int for percent on Windows. And a minor safety check bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 119 diff changeset	7936 {
edf615d8266e Use float instead of int for percent on Windows. And a minor safety check bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 119 diff changeset	7937 float percent = (float )dw_window_get_data(handle, "_dw_percent");
edf615d8266e Use float instead of int for percent on Windows. And a minor safety check bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 119 diff changeset	7938
edf615d8266e Use float instead of int for percent on Windows. And a minor safety check bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 119 diff changeset	7939 if(percent)
edf615d8266e Use float instead of int for percent on Windows. And a minor safety check bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 119 diff changeset	7940 return *percent;
edf615d8266e Use float instead of int for percent on Windows. And a minor safety check bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 119 diff changeset	7941 return 0.0;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7942 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7943
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7944 /*
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7945 * Pack windows (widgets) into a box from the end (or bottom).
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7946 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7947 * box: Window handle of the box to be packed into.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7948 * item: Window handle of the item to be back.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7949 * width: Width in pixels of the item or -1 to be self determined.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7950 * height: Height in pixels of the item or -1 to be self determined.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7951 * hsize: TRUE if the window (widget) should expand horizontally to fill space given.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7952 * vsize: TRUE if the window (widget) should expand vertically to fill space given.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7953 * pad: Number of pixels of padding around the item.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7954 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7955 void API dw_box_pack_end(HWND box, HWND item, int width, int height, int hsize, int vsize, int pad)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7956 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7957 Box *thisbox;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7958
447 5a0779561d0f Add more tests for dw_pac() functions. Throw up a messagebox if you try and mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 444 diff changeset	7959 /*
5a0779561d0f Add more tests for dw_pac() functions. Throw up a messagebox if you try and mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 444 diff changeset	7960 * If you try and pack an item into itself VERY bad things can happen; like at least an
5a0779561d0f Add more tests for dw_pac() functions. Throw up a messagebox if you try and mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 444 diff changeset	7961 * infinite loop on GTK! Lets be safe!
5a0779561d0f Add more tests for dw_pac() functions. Throw up a messagebox if you try and mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 444 diff changeset	7962 */
5a0779561d0f Add more tests for dw_pac() functions. Throw up a messagebox if you try and mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 444 diff changeset	7963 if(box == item)
5a0779561d0f Add more tests for dw_pac() functions. Throw up a messagebox if you try and mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 444 diff changeset	7964 {
526 d3ce0afa6cf5 Remove extraneous arguments to dw_messagebox() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 522 diff changeset	7965 dw_messagebox("dw_box_pack_end()", DW_MB_OK\|DW_MB_ERROR, "Danger! Danger! Will Robinson; box and item are the same!");
447 5a0779561d0f Add more tests for dw_pac() functions. Throw up a messagebox if you try and mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 444 diff changeset	7966 return;
5a0779561d0f Add more tests for dw_pac() functions. Throw up a messagebox if you try and mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 444 diff changeset	7967 }
5a0779561d0f Add more tests for dw_pac() functions. Throw up a messagebox if you try and mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 444 diff changeset	7968
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	7969 thisbox = (Box *)GetWindowLongPtr(box, GWLP_USERDATA);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7970 if(thisbox)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7971 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7972 int z;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7973 Item tmpitem, thisitem = thisbox->items;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7974 char tmpbuf[100];
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7975
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7976 tmpitem = malloc(sizeof(Item)*(thisbox->count+1));
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7977
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7978 for(z=0;z<thisbox->count;z++)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7979 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7980 tmpitem[z+1] = thisitem[z];
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7981 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7982
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7983 GetClassName(item, tmpbuf, 99);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7984
298 caed245ea8a1 Sanity check, if expand is set width/height can't be zero... force it to 1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 295 diff changeset	7985 if(vsize && !height)
caed245ea8a1 Sanity check, if expand is set width/height can't be zero... force it to 1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 295 diff changeset	7986 height = 1;
caed245ea8a1 Sanity check, if expand is set width/height can't be zero... force it to 1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 295 diff changeset	7987 if(hsize && !width)
caed245ea8a1 Sanity check, if expand is set width/height can't be zero... force it to 1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 295 diff changeset	7988 width = 1;
caed245ea8a1 Sanity check, if expand is set width/height can't be zero... force it to 1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 295 diff changeset	7989
440 9af47c551a56 Noticed an artifact from the OS/2 port that was incorrect. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 439 diff changeset	7990 if(strnicmp(tmpbuf, FRAMECLASSNAME, strlen(FRAMECLASSNAME)+1)==0)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7991 tmpitem[0].type = TYPEBOX;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7992 else
438 fac2afe7bda3 Only throw up the messagebox when expand and size are both 0 and the item bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 436 diff changeset	7993 {
fac2afe7bda3 Only throw up the messagebox when expand and size are both 0 and the item bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 436 diff changeset	7994 if ( width == 0 && hsize == FALSE )
fac2afe7bda3 Only throw up the messagebox when expand and size are both 0 and the item bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 436 diff changeset	7995 dw_messagebox("dw_box_pack_end()", DW_MB_OK\|DW_MB_ERROR, "Width and expand Horizonal both unset for box: %x item: %x",box,item);
fac2afe7bda3 Only throw up the messagebox when expand and size are both 0 and the item bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 436 diff changeset	7996 if ( height == 0 && vsize == FALSE )
fac2afe7bda3 Only throw up the messagebox when expand and size are both 0 and the item bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 436 diff changeset	7997 dw_messagebox("dw_box_pack_end()", DW_MB_OK\|DW_MB_ERROR, "Height and expand Vertical both unset for box: %x item: %x",box,item);
fac2afe7bda3 Only throw up the messagebox when expand and size are both 0 and the item bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 436 diff changeset	7998
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7999 tmpitem[0].type = TYPEITEM;
438 fac2afe7bda3 Only throw up the messagebox when expand and size are both 0 and the item bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 436 diff changeset	8000 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8001
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8002 tmpitem[0].hwnd = item;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8003 tmpitem[0].origwidth = tmpitem[0].width = width;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8004 tmpitem[0].origheight = tmpitem[0].height = height;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8005 tmpitem[0].pad = pad;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8006 if(hsize)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8007 tmpitem[0].hsize = SIZEEXPAND;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8008 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8009 tmpitem[0].hsize = SIZESTATIC;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8010
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8011 if(vsize)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8012 tmpitem[0].vsize = SIZEEXPAND;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8013 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8014 tmpitem[0].vsize = SIZESTATIC;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8015
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8016 thisbox->items = tmpitem;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8017
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8018 if(thisbox->count)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8019 free(thisitem);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8020
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8021 thisbox->count++;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8022
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8023 SetParent(item, box);
440 9af47c551a56 Noticed an artifact from the OS/2 port that was incorrect. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 439 diff changeset	8024 if(strncmp(tmpbuf, UPDOWN_CLASS, strlen(UPDOWN_CLASS)+1)==0)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8025 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	8026 ColorInfo cinfo = (ColorInfo )GetWindowLongPtr(item, GWLP_USERDATA);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8027
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8028 if(cinfo)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8029 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8030 SetParent(cinfo->buddy, box);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8031 ShowWindow(cinfo->buddy, SW_SHOW);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8032 SendMessage(item, UDM_SETBUDDY, (WPARAM)cinfo->buddy, 0);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8033 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8034 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8035 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8036 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8037
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8038 /*
34 b03b24bb95f8 Added dw_window_default() to set the default focus widget in a dialog. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 33 diff changeset	8039 * Sets the default focus item for a window/dialog.
b03b24bb95f8 Added dw_window_default() to set the default focus widget in a dialog. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 33 diff changeset	8040 * Parameters:
b03b24bb95f8 Added dw_window_default() to set the default focus widget in a dialog. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 33 diff changeset	8041 * window: Toplevel window or dialog.
b03b24bb95f8 Added dw_window_default() to set the default focus widget in a dialog. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 33 diff changeset	8042 * defaultitem: Handle to the dialog item to be default.
b03b24bb95f8 Added dw_window_default() to set the default focus widget in a dialog. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 33 diff changeset	8043 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	8044 void API dw_window_default(HWND window, HWND defaultitem)
34 b03b24bb95f8 Added dw_window_default() to set the default focus widget in a dialog. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 33 diff changeset	8045 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	8046 Box thisbox = (Box )GetWindowLongPtr(window, GWLP_USERDATA);
34 b03b24bb95f8 Added dw_window_default() to set the default focus widget in a dialog. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 33 diff changeset	8047
b03b24bb95f8 Added dw_window_default() to set the default focus widget in a dialog. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 33 diff changeset	8048 if(thisbox)
b03b24bb95f8 Added dw_window_default() to set the default focus widget in a dialog. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 33 diff changeset	8049 thisbox->defaultitem = defaultitem;
b03b24bb95f8 Added dw_window_default() to set the default focus widget in a dialog. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 33 diff changeset	8050 }
b03b24bb95f8 Added dw_window_default() to set the default focus widget in a dialog. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 33 diff changeset	8051
b03b24bb95f8 Added dw_window_default() to set the default focus widget in a dialog. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 33 diff changeset	8052 /*
40 88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	8053 * Sets window to click the default dialog item when an ENTER is pressed.
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	8054 * Parameters:
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	8055 * window: Window (widget) to look for the ENTER press.
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	8056 * next: Window (widget) to move to next (or click)
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	8057 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	8058 void API dw_window_click_default(HWND window, HWND next)
40 88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	8059 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	8060 ColorInfo cinfo = (ColorInfo )GetWindowLongPtr(window, GWLP_USERDATA);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8061
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8062 if(cinfo)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8063 cinfo->clickdefault = next;
40 88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	8064 }
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	8065
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	8066 /*
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8067 * Returns some information about the current operating environment.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8068 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8069 * env: Pointer to a DWEnv struct.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8070 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	8071 void API dw_environment_query(DWEnv *env)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8072 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8073 if(!env)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8074 return;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8075
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8076 /* Get the Windows version. */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8077
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8078 env->MajorVersion = (DWORD)(LOBYTE(LOWORD(dwVersion)));
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8079 env->MinorVersion = (DWORD)(HIBYTE(LOWORD(dwVersion)));
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8080
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8081 /* Get the build number for Windows NT/Windows 2000. */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8082
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8083 env->MinorBuild = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8084
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8085 if (dwVersion < 0x80000000)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8086 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8087 if(env->MajorVersion == 5 && env->MinorVersion == 1)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8088 strcpy(env->osName, "Windows XP");
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8089 else if(env->MajorVersion == 5 && env->MinorVersion == 0)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8090 strcpy(env->osName, "Windows 2000");
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8091 else
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8092 strcpy(env->osName, "Windows NT");
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8093
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8094 env->MajorBuild = (DWORD)(HIWORD(dwVersion));
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8095 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8096 else
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8097 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8098 strcpy(env->osName, "Windows 95/98/ME");
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8099 env->MajorBuild = 0;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8100 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8101
15 81833f25b1aa Added new Dynamic Windows build information to the DWEnv struct. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 14 diff changeset	8102 strcpy(env->buildDate, __DATE__);
81833f25b1aa Added new Dynamic Windows build information to the DWEnv struct. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 14 diff changeset	8103 strcpy(env->buildTime, __TIME__);
81833f25b1aa Added new Dynamic Windows build information to the DWEnv struct. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 14 diff changeset	8104 env->DWMajorVersion = DW_MAJOR_VERSION;
81833f25b1aa Added new Dynamic Windows build information to the DWEnv struct. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 14 diff changeset	8105 env->DWMinorVersion = DW_MINOR_VERSION;
81833f25b1aa Added new Dynamic Windows build information to the DWEnv struct. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 14 diff changeset	8106 env->DWSubVersion = DW_SUB_VERSION;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8107 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8108
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8109 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8110 * Opens a file dialog and queries user selection.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8111 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8112 * title: Title bar text for dialog.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8113 * defpath: The default path of the open dialog.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8114 * ext: Default file extention.
449 787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8115 * flags: DW_FILE_OPEN or DW_FILE_SAVE or DW_DIRECTORY_OPEN.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8116 * Returns:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8117 * NULL on error. A malloced buffer containing
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8118 * the file path on success.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8119 *
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8120 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	8121 char * API dw_file_browse(char title, char defpath, char *ext, int flags)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8122 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8123 OPENFILENAME of;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8124 char filenamebuf[1001] = "";
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8125 int rc;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8126
449 787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8127 BROWSEINFO bi;
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8128 TCHAR szDir[MAX_PATH];
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8129 LPITEMIDLIST pidl;
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8130 LPMALLOC pMalloc;
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8131
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8132 if(flags==DW_DIRECTORY_OPEN)
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8133 {
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8134 if (SUCCEEDED(SHGetMalloc(&pMalloc)))
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8135 {
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8136 ZeroMemory(&bi,sizeof(bi));
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8137 bi.hwndOwner = NULL;
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8138 bi.pszDisplayName = 0;
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8139 bi.pidlRoot = 0;
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8140 bi.lpszTitle = title;
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8141 bi.ulFlags = BIF_RETURNONLYFSDIRS \| BIF_STATUSTEXT;
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8142 bi.lpfn = NULL; /BrowseCallbackProc/
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8143
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8144 pidl = SHBrowseForFolder(&bi);
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8145 if (pidl)
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8146 {
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8147 if (SHGetPathFromIDList(pidl,szDir))
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8148 {
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8149 strcpy(filenamebuf,szDir);
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8150 }
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8151
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8152 // In C++: pMalloc->Free(pidl); pMalloc->Release();
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8153 pMalloc->lpVtbl->Free(pMalloc,pidl);
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8154 pMalloc->lpVtbl->Release(pMalloc);
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8155 return strdup(filenamebuf);
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8156 }
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8157 }
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8158 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8159 else
449 787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8160 {
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8161 if(ext)
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8162 {
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8163 strcpy(filenamebuf, "*.");
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8164 strcat(filenamebuf, ext);
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8165 }
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8166
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8167 memset(&of, 0, sizeof(OPENFILENAME));
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8168
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8169 of.lStructSize = sizeof(OPENFILENAME);
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8170 of.hwndOwner = HWND_DESKTOP;
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8171 of.hInstance = DWInstance;
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8172 of.lpstrInitialDir = defpath;
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8173 of.lpstrTitle = title;
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8174 of.lpstrFile = filenamebuf;
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8175 of.nMaxFile = 1000;
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8176 of.lpstrDefExt = ext;
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8177 of.Flags = 0;
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8178
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8179 if(flags & DW_FILE_SAVE)
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8180 rc = GetSaveFileName(&of);
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8181 else
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8182 rc = GetOpenFileName(&of);
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8183
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8184 if(rc)
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8185 return strdup(of.lpstrFile);
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	8186 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8187 return NULL;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8188 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8189
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8190 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8191 * Execute and external program in a seperate session.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8192 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8193 * program: Program name with optional path.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8194 * type: Either DW_EXEC_CON or DW_EXEC_GUI.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8195 * params: An array of pointers to string arguements.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8196 * Returns:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8197 * -1 on error.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8198 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	8199 int API dw_exec(char program, int type, char *params)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8200 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8201 char **newparams;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8202 int retcode, count = 0, z;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8203
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8204 while(params[count])
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8205 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8206 count++;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8207 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8208
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8209 newparams = (char *)malloc(sizeof(char ) * (count+1));
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8210
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8211 for(z=0;z<count;z++)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8212 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8213 newparams[z] = malloc(strlen(params[z])+3);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8214 strcpy(newparams[z], "\"");
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8215 strcat(newparams[z], params[z]);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8216 strcat(newparams[z], "\"");
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8217 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8218 newparams[count] = NULL;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8219
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8220 retcode = spawnvp(P_NOWAIT, program, newparams);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8221
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8222 for(z=0;z<count;z++)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8223 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8224 free(newparams[z]);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8225 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8226 free(newparams);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8227
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8228 return retcode;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8229 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8230
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8231 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8232 * Loads a web browser pointed at the given URL.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8233 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8234 * url: Uniform resource locator.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8235 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	8236 int API dw_browse(char *url)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8237 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8238 char *browseurl = url;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8239 int retcode;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8240
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8241 if(strlen(url) > 7 && strncmp(url, "file://", 7) == 0)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8242 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8243 int len, z;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8244
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8245 browseurl = &url[7];
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8246 len = strlen(browseurl);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8247
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8248 for(z=0;z<len;z++)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8249 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8250 if(browseurl[z] == '\|')
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8251 browseurl[z] = ':';
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8252 if(browseurl[z] == '/')
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8253 browseurl[z] = '\\';
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8254 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8255 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8256
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8257 retcode = (int)ShellExecute(NULL, "open", browseurl, NULL, NULL, SW_SHOWNORMAL);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8258 if(retcode<33 && retcode != 2)
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8259 return -1;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8260 return 1;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8261 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8262
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8263 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8264 * Returns a pointer to a static buffer which containes the
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8265 * current user directory. Or the root directory (C:\ on
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8266 * OS/2 and Windows).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8267 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	8268 char * API dw_user_dir(void)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8269 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8270 static char _user_dir[1024] = "";
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8271
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8272 if(!_user_dir[0])
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8273 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8274 /* Figure out how to do this the "Windows way" */
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8275 char *home = getenv("HOME");
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8276
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8277 if(home)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8278 strcpy(_user_dir, home);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8279 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8280 strcpy(_user_dir, "C:\\");
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8281 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8282 return _user_dir;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8283 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8284
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8285 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8286 * Call a function from the window (widget)'s context.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8287 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8288 * handle: Window handle of the widget.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8289 * function: Function pointer to be called.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8290 * data: Pointer to the data to be passed to the function.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8291 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	8292 void API dw_window_function(HWND handle, void function, void data)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8293 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8294 SendMessage(handle, WM_USER, (WPARAM)function, (LPARAM)data);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8295 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8296
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8297 /* Functions for managing the user data lists that are associated with
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8298 * a given window handle. Used in dw_window_set_data() and
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8299 * dw_window_get_data().
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8300 */
180 4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8301 UserData _find_userdata(UserData root, char varname)
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8302 {
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8303 UserData tmp = root;
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8304
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8305 while(tmp)
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8306 {
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8307 if(stricmp(tmp->varname, varname) == 0)
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8308 return tmp;
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8309 tmp = tmp->next;
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8310 }
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8311 return NULL;
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8312 }
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8313
180 4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8314 int _new_userdata(UserData *root, char varname, void *data)
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8315 {
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8316 UserData *new = _find_userdata(root, varname);
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8317
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8318 if(new)
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8319 {
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8320 new->data = data;
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8321 return TRUE;
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8322 }
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8323 else
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8324 {
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8325 new = malloc(sizeof(UserData));
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8326 if(new)
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8327 {
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8328 new->varname = strdup(varname);
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8329 new->data = data;
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8330
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8331 new->next = NULL;
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8332
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8333 if (!*root)
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8334 *root = new;
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8335 else
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8336 {
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8337 UserData prev = NULL, tmp = *root;
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8338 while(tmp)
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8339 {
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8340 prev = tmp;
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8341 tmp = tmp->next;
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8342 }
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8343 if(prev)
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8344 prev->next = new;
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8345 else
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8346 *root = new;
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8347 }
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8348 return TRUE;
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8349 }
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8350 }
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8351 return FALSE;
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8352 }
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8353
180 4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8354 int _remove_userdata(UserData *root, char varname, int all)
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8355 {
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8356 UserData prev = NULL, tmp = *root;
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8357
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8358 while(tmp)
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8359 {
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8360 if(all \|\| stricmp(tmp->varname, varname) == 0)
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8361 {
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8362 if(!prev)
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8363 {
147 b479002e013f Upped the DW revision to 1.0, and merged with the latest code in the FX bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 136 diff changeset	8364 *root = tmp->next;
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8365 free(tmp->varname);
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8366 free(tmp);
180 4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8367 if(!all)
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8368 return 0;
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8369 tmp = *root;
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8370 }
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8371 else
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8372 {
180 4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8373 /* If all is true we should
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8374 * never get here.
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8375 */
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8376 prev->next = tmp->next;
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8377 free(tmp->varname);
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8378 free(tmp);
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8379 return 0;
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8380 }
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8381 }
180 4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8382 else
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8383 {
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8384 prev = tmp;
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8385 tmp = tmp->next;
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8386 }
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8387 }
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8388 return 0;
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8389 }
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8390
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8391 /*
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8392 * Add a named user data item to a window handle.
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8393 * Parameters:
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8394 * window: Window handle of signal to be called back.
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8395 * dataname: A string pointer identifying which signal to be hooked.
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8396 * data: User data to be passed to the handler function.
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8397 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	8398 void API dw_window_set_data(HWND window, char dataname, void data)
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8399 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	8400 ColorInfo cinfo = (ColorInfo )GetWindowLongPtr(window, GWLP_USERDATA);
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8401
118 c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	8402 if(!cinfo)
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	8403 {
180 4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8404 if(!dataname)
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8405 return;
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8406
118 c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	8407 cinfo = calloc(1, sizeof(ColorInfo));
204 098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	8408 cinfo->fore = cinfo->back = -1;
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	8409 SetWindowLongPtr(window, GWLP_USERDATA, (LONG_PTR)cinfo);
118 c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	8410 }
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	8411
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8412 if(cinfo)
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8413 {
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8414 if(data)
180 4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8415 _new_userdata(&(cinfo->root), dataname, data);
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8416 else
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8417 {
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8418 if(dataname)
180 4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8419 _remove_userdata(&(cinfo->root), dataname, FALSE);
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8420 else
180 4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8421 _remove_userdata(&(cinfo->root), NULL, TRUE);
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8422 }
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8423 }
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8424 }
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8425
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8426 /*
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8427 * Gets a named user data item to a window handle.
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8428 * Parameters:
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8429 * window: Window handle of signal to be called back.
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8430 * dataname: A string pointer identifying which signal to be hooked.
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8431 * data: User data to be passed to the handler function.
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8432 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	8433 void * API dw_window_get_data(HWND window, char *dataname)
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8434 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	8435 ColorInfo cinfo = (ColorInfo )GetWindowLongPtr(window, GWLP_USERDATA);
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8436
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8437 if(cinfo && cinfo->root && dataname)
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8438 {
180 4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8439 UserData *ud = _find_userdata(&(cinfo->root), dataname);
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8440 if(ud)
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8441 return ud->data;
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8442 }
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8443 return NULL;
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8444 }
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8445
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8446 /*
197 f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8447 * Add a callback to a timer event.
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8448 * Parameters:
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8449 * interval: Milliseconds to delay between calls.
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8450 * sigfunc: The pointer to the function to be used as the callback.
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8451 * data: User data to be passed to the handler function.
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8452 * Returns:
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8453 * Timer ID for use with dw_timer_disconnect(), 0 on error.
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8454 */
200 446dd8cea477 Removed window parameter on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 197 diff changeset	8455 int API dw_timer_connect(int interval, void sigfunc, void data)
446dd8cea477 Removed window parameter on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 197 diff changeset	8456 {
446dd8cea477 Removed window parameter on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 197 diff changeset	8457 if(sigfunc)
446dd8cea477 Removed window parameter on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 197 diff changeset	8458 {
461 12ba7e744560 Fixes timer problems on Windows, however this may break Win95 support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 456 diff changeset	8459 int timerid = SetTimer(NULL, 0, interval, _TimerProc);
200 446dd8cea477 Removed window parameter on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 197 diff changeset	8460
446dd8cea477 Removed window parameter on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 197 diff changeset	8461 if(timerid)
446dd8cea477 Removed window parameter on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 197 diff changeset	8462 {
446dd8cea477 Removed window parameter on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 197 diff changeset	8463 _new_signal(WM_TIMER, NULL, timerid, sigfunc, data);
446dd8cea477 Removed window parameter on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 197 diff changeset	8464 return timerid;
446dd8cea477 Removed window parameter on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 197 diff changeset	8465 }
197 f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8466 }
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8467 return 0;
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8468 }
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8469
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8470 /*
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8471 * Removes timer callback.
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8472 * Parameters:
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8473 * id: Timer ID returned by dw_timer_connect().
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8474 */
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8475 void API dw_timer_disconnect(int id)
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8476 {
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8477 SignalHandler prev = NULL, tmp = Root;
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8478
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8479 /* 0 is an invalid timer ID */
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8480 if(!id)
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8481 return;
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8482
200 446dd8cea477 Removed window parameter on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 197 diff changeset	8483 KillTimer(NULL, id);
446dd8cea477 Removed window parameter on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 197 diff changeset	8484
197 f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8485 while(tmp)
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8486 {
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8487 if(tmp->id == id)
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8488 {
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8489 if(prev)
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8490 {
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8491 prev->next = tmp->next;
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8492 free(tmp);
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8493 tmp = prev->next;
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8494 }
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8495 else
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8496 {
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8497 Root = tmp->next;
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8498 free(tmp);
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8499 tmp = Root;
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8500 }
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8501 }
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8502 else
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8503 {
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8504 prev = tmp;
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8505 tmp = tmp->next;
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8506 }
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8507 }
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8508 }
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8509
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8510 /*
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8511 * Add a callback to a window event.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8512 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8513 * window: Window handle of signal to be called back.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8514 * signame: A string pointer identifying which signal to be hooked.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8515 * sigfunc: The pointer to the function to be used as the callback.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8516 * data: User data to be passed to the handler function.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8517 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	8518 void API dw_signal_connect(HWND window, char signame, void sigfunc, void *data)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8519 {
466 c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	8520 ULONG message = 0, id = 0;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8521
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8522 if(window && signame && sigfunc)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8523 {
307 324587c06cea Use the signal #defines internally so all that is required to change bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 303 diff changeset	8524 if(stricmp(signame, DW_SIGNAL_SET_FOCUS) == 0)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8525 window = _normalize_handle(window);
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	8526
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8527 if((message = _findsigmessage(signame)) != 0)
466 c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	8528 {
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	8529 /* Handle special case of the menu item */
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	8530 if(message == WM_COMMAND && window < (HWND)65536)
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	8531 {
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	8532 char buffer[15];
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	8533 HWND owner;
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	8534
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	8535 sprintf(buffer, "_dw_id%d", (int)window);
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	8536 owner = (HWND)dw_window_get_data(DW_HWND_OBJECT, buffer);
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	8537
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	8538 if(owner)
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	8539 {
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	8540 id = (ULONG)window;
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	8541 window = owner;
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	8542 dw_window_set_data(DW_HWND_OBJECT, buffer, 0);
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	8543 }
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	8544 else
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	8545 {
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	8546 /* If it is a popup menu clear all entries */
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	8547 dw_signal_disconnect_by_window(window);
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	8548 }
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	8549 }
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	8550 _new_signal(message, window, id, sigfunc, data);
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	8551 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8552 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8553 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8554
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8555 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8556 * Removes callbacks for a given window with given name.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8557 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8558 * window: Window handle of callback to be removed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8559 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	8560 void API dw_signal_disconnect_by_name(HWND window, char *signame)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8561 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8562 SignalHandler prev = NULL, tmp = Root;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8563 ULONG message;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8564
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8565 if(!window \|\| !signame \|\| (message = _findsigmessage(signame)) == 0)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8566 return;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8567
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8568 while(tmp)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8569 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8570 if(tmp->window == window && tmp->message == message)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8571 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8572 if(prev)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8573 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8574 prev->next = tmp->next;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8575 free(tmp);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8576 tmp = prev->next;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8577 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8578 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8579 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8580 Root = tmp->next;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8581 free(tmp);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8582 tmp = Root;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8583 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8584 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8585 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8586 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8587 prev = tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8588 tmp = tmp->next;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8589 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8590 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8591 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8592
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8593 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8594 * Removes all callbacks for a given window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8595 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8596 * window: Window handle of callback to be removed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8597 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	8598 void API dw_signal_disconnect_by_window(HWND window)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8599 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8600 SignalHandler prev = NULL, tmp = Root;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8601
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8602 while(tmp)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8603 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8604 if(tmp->window == window)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8605 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8606 if(prev)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8607 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8608 prev->next = tmp->next;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8609 free(tmp);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8610 tmp = prev->next;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8611 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8612 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8613 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8614 Root = tmp->next;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8615 free(tmp);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8616 tmp = Root;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8617 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8618 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8619 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8620 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8621 prev = tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8622 tmp = tmp->next;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8623 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8624 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8625 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8626
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8627 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8628 * Removes all callbacks for a given window with specified data.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8629 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8630 * window: Window handle of callback to be removed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8631 * data: Pointer to the data to be compared against.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8632 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	8633 void API dw_signal_disconnect_by_data(HWND window, void *data)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8634 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8635 SignalHandler prev = NULL, tmp = Root;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8636
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8637 while(tmp)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8638 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8639 if(tmp->window == window && tmp->data == data)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8640 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8641 if(prev)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8642 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8643 prev->next = tmp->next;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8644 free(tmp);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8645 tmp = prev->next;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8646 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8647 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8648 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8649 Root = tmp->next;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8650 free(tmp);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8651 tmp = Root;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8652 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8653 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8654 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8655 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8656 prev = tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8657 tmp = tmp->next;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8658 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8659 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8660 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8661

Mercurial > dwindows

annotate win/dw.c @ 535:b0b5b880513a