dwindows: win/dw.c annotate

annotate win/dw.c @ 468:0a2f13ba2d5c

More menu fixes, free signal handlers and memory on OS/2, and the begining for Windows.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Wed, 08 Oct 2003 21:40:06 +0000
parents	ecf1df2edcee
children	7952b9c1dc07

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 *
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	6 * (C) 2000-2003 Brian Smith <dbsoft@technologist.com>
369 39983df2b93d Updated the license information, and copyrights. Code to do background bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 355 diff changeset	7 * (C) 2003 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 #ifdef WINNT_COMPAT
58 5c66a108aa47 Fixed 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 #define WINVER 0x400
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	13 #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	14 #define WINVER 0x500
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	15 #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	16 #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	17 #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	18 #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	19 #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	20 #include <shlobj.h>
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	21 #include <stdlib.h>
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	22 #include <string.h>
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	23 #include <stdio.h>
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	24 #include <process.h>
37 360bc6a5f1c9 Sync with latest Dynamic Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 34 diff changeset	25 #include <time.h>
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	26 #include "dw.h"
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	27
93 98cce029a611 Changed handling of menu item click events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 90 diff changeset	28 HWND popup = (HWND)NULL, hwndBubble = (HWND)NULL, hwndBubbleLast, 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	29
5c66a108aa47 Fixed 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 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	31
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	32 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	33 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	34
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	35 #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	36
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	37 #define IS_IE5PLUS (dwComctlVer >= PACKVERSION(5,80))
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	38
95 636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	39 #ifndef MIN
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	40 #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	41 #endif
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 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;
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	85 int _index;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	86
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	87 typedef struct
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	88 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	89 ULONG message;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	90 char name[30];
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	91
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	92 } SignalList;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	93
60 61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	94 static int in_checkbox_handler = 0;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	95
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	96 /* List of signals and their equivilent Win32 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	97 #define SIGNALMAX 15
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	98
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	99 SignalList SignalTranslate[SIGNALMAX] = {
307 324587c06cea Use the signal #defines internally so all that is required to change bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 303 diff changeset	100 { WM_SIZE, DW_SIGNAL_CONFIGURE },
324587c06cea Use the signal #defines internally so all that is required to change bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 303 diff changeset	101 { WM_CHAR, DW_SIGNAL_KEY_PRESS },
324587c06cea Use the signal #defines internally so all that is required to change bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 303 diff changeset	102 { WM_LBUTTONDOWN, DW_SIGNAL_BUTTON_PRESS },
324587c06cea Use the signal #defines internally so all that is required to change bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 303 diff changeset	103 { WM_LBUTTONUP, DW_SIGNAL_BUTTON_PRESS },
324587c06cea Use the signal #defines internally so all that is required to change bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 303 diff changeset	104 { WM_MOUSEMOVE, DW_SIGNAL_MOTION_NOTIFY },
324587c06cea Use the signal #defines internally so all that is required to change bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 303 diff changeset	105 { WM_CLOSE, DW_SIGNAL_DELETE },
324587c06cea Use the signal #defines internally so all that is required to change bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 303 diff changeset	106 { WM_PAINT, DW_SIGNAL_EXPOSE },
324587c06cea Use the signal #defines internally so all that is required to change bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 303 diff changeset	107 { WM_COMMAND, DW_SIGNAL_CLICKED },
324587c06cea Use the signal #defines internally so all that is required to change bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 303 diff changeset	108 { NM_DBLCLK, DW_SIGNAL_ITEM_ENTER },
324587c06cea Use the signal #defines internally so all that is required to change bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 303 diff changeset	109 { NM_RCLICK, DW_SIGNAL_ITEM_CONTEXT },
324587c06cea Use the signal #defines internally so all that is required to change bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 303 diff changeset	110 { LBN_SELCHANGE, DW_SIGNAL_LIST_SELECT },
324587c06cea Use the signal #defines internally so all that is required to change bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 303 diff changeset	111 { TVN_SELCHANGED, DW_SIGNAL_ITEM_SELECT },
324587c06cea Use the signal #defines internally so all that is required to change bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 303 diff changeset	112 { WM_SETFOCUS, DW_SIGNAL_SET_FOCUS },
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	113 { WM_VSCROLL, DW_SIGNAL_VALUE_CHANGED },
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	114 { TCN_SELCHANGE, DW_SIGNAL_SWITCH_PAGE }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	115 };
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	116
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	117 #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	118 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	119 {
5c66a108aa47 Fixed 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 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	121 }
5c66a108aa47 Fixed 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 #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	123 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	124 {
5c66a108aa47 Fixed 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 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	126 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	127
5c66a108aa47 Fixed 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 (*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	129
5c66a108aa47 Fixed 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 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	131
5c66a108aa47 Fixed 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 /* 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	133 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	134 {
5c66a108aa47 Fixed 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 (*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	136
5c66a108aa47 Fixed 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 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	138 {
5c66a108aa47 Fixed 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 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	140 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	141 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	142 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	143 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	144 {
5c66a108aa47 Fixed 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 /* 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	146 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	147 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	148 /* 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	149 * 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	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	151 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	152 (*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	153 }
5c66a108aa47 Fixed 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 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	155 }
5c66a108aa47 Fixed 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 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	159 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	160 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	161
5c66a108aa47 Fixed 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 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	163
5c66a108aa47 Fixed 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 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	165 {
5c66a108aa47 Fixed 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 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	167
5c66a108aa47 Fixed 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 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	169 {
5c66a108aa47 Fixed 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 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	171 {
5c66a108aa47 Fixed 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 *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	173 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	174 }
5c66a108aa47 Fixed 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 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	176 {
5c66a108aa47 Fixed 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 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	178 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	179 }
5c66a108aa47 Fixed 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 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	181 {
5c66a108aa47 Fixed 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 *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	183 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	184
5c66a108aa47 Fixed 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 /* 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	186 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	187 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	188
5c66a108aa47 Fixed 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 /* 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	190 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	191
5c66a108aa47 Fixed 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 /* 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	193 * 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	194 */
5c66a108aa47 Fixed 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 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	196 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	197 }
5c66a108aa47 Fixed 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 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	199 }
5c66a108aa47 Fixed 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 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	201 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	202 }
5c66a108aa47 Fixed 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 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	204 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	205 }
5c66a108aa47 Fixed 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 /* 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	208 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	209 {
5c66a108aa47 Fixed 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 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	211 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	212
5c66a108aa47 Fixed 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 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	214
5c66a108aa47 Fixed 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 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	216
5c66a108aa47 Fixed 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 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	218 }
5c66a108aa47 Fixed 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 #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	220
5c66a108aa47 Fixed 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 /* 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	222 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	223 {
5c66a108aa47 Fixed 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 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	225
5c66a108aa47 Fixed 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 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	227 {
5c66a108aa47 Fixed 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 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	229 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	230 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	231 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	232 }
5c66a108aa47 Fixed 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 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	234 }
5c66a108aa47 Fixed 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
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	236 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	237 {
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 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	240 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	241
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 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	243
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 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	245 {
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 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	247
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 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	249
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 /* 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	251 * 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	252 * 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	253 * 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	254 */
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 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	256 {
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 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	258 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	259
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 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	261 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	262
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 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	264
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 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	266 {
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 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	268 }
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 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	272 }
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 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	274 }
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
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	276 /* This function adds a signal handler callback into the linked list.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	277 */
197 f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	278 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	279 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	280 SignalHandler *new = malloc(sizeof(SignalHandler));
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	281
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	282 new->message = message;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	283 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	284 new->id = id;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	285 new->signalfunction = signalfunction;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	286 new->data = data;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	287 new->next = NULL;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	288
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	289 if (!Root)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	290 Root = new;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	291 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	292 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	293 SignalHandler prev = NULL, tmp = Root;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	294 while(tmp)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	295 {
68 8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	296 if(tmp->message == message &&
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	297 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	298 tmp->id == id &&
68 8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	299 tmp->signalfunction == signalfunction)
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	300 {
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	301 tmp->data = data;
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	302 free(new);
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	303 return;
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	304 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	305 prev = tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	306 tmp = tmp->next;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	307 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	308 if(prev)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	309 prev->next = new;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	310 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	311 Root = new;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	312 }
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 /* Finds the message number for a given signal name */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	316 ULONG _findsigmessage(char *signame)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	317 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	318 int z;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	319
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	320 for(z=0;z<SIGNALMAX;z++)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	321 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	322 if(stricmp(signame, SignalTranslate[z].name) == 0)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	323 return SignalTranslate[z].message;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	324 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	325 return 0L;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	326 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	327
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	328 /* This function removes and handlers on windows and frees
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	329 * the user memory allocated to it.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	330 */
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	331 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	332 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	333 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	334 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	335 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	336 char tmpbuf[100];
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	337
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	338 /* 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	339 if(oldfont)
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	340 DeleteObject(oldfont);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	341 if(oldicon)
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	342 DeleteObject(oldicon);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	343
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	344 GetClassName(handle, tmpbuf, 99);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	345
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	346 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	347 {
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	348 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	349
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	350 if(oldbitmap)
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	351 DeleteObject(oldbitmap);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	352 }
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	353 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	354 {
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	355 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	356
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	357 if(oldbitmap)
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	358 DeleteObject(oldbitmap);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	359 }
180 4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	360 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	361 {
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	362 Box box = (Box )thiscinfo;
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	363
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	364 if(box->count && box->items)
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	365 free(box->items);
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	366 }
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	367 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	368 {
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	369 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	370
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	371 if(data)
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	372 free(data);
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	373 }
291 70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	374 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	375 {
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	376 dw_tree_clear(handle);
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	377 }
180 4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	378 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	379 {
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	380 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	381
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	382 if(array)
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	383 {
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	384 int z, refid = -1;
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	385
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	386 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	387 {
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	388 if(array[z])
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	389 {
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	390 _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	391 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	392 DestroyWindow(array[z]->hwnd);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	393 free(array[z]);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	394 }
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	395 }
343 bab5cd8dd93f Forgot to free the array of pointers in the notebook control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 341 diff changeset	396 free(array);
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	397 }
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	398 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	399
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	400 dw_signal_disconnect_by_window(handle);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	401
82 aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	402 if(thiscinfo)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	403 {
180 4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	404 SubclassWindow(handle, thiscinfo->pOldProc);
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	405
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	406 /* 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	407 if(thiscinfo->hbrush)
aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	408 DeleteObject(thiscinfo->hbrush);
aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	409
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	410 /* 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	411 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	412 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	413
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	414 SetWindowLongPtr(handle, GWLP_USERDATA, 0);
82 aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	415 free(thiscinfo);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	416 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	417 return TRUE;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	418 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	419
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	420 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	421 {
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 /* TODO: This needs to call this on all submenus */
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	423 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	424 }
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	425
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	426 /* 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	427 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	428 {
369 39983df2b93d Updated the license information, and copyrights. Code to do background bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 355 diff changeset	429 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	430 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	431 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	432 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	433 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	434 }
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	435
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	436 /* This function returns 1 if the window (widget) handle
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	437 * passed to it is a valid window that can gain input focus.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	438 */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	439 int _validate_focus(HWND handle)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	440 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	441 char tmpbuf[100];
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	442
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	443 if(!handle)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	444 return 0;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	445
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	446 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	447 return 0;
3aa9ef0b3996 Added focus fixes and set-focus fixes on all three platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 37 diff changeset	448
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	449 GetClassName(handle, tmpbuf, 99);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	450
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	451 /* These are the window classes which can
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	452 * obtain input focus.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	453 */
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	454 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	455 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	456 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	457 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	458 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	459 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	460 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	461 strnicmp(tmpbuf, WC_TREEVIEW, strlen(WC_TREEVIEW)+1)== 0) /* Tree */
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	462 return 1;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	463 return 0;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	464 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	465
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	466 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	467 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	468 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	469
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	470 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	471 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	472 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	473 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	474
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	475 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	476 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	477 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	478 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	479 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	480 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	481
5c66a108aa47 Fixed 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 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	483 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	484 }
5c66a108aa47 Fixed 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 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	486 }
5c66a108aa47 Fixed 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
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	488 int _focus_check_box(Box *box, HWND handle, int start, HWND defaultitem)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	489 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	490 int z;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	491 static HWND lasthwnd, firsthwnd;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	492 static int finish_searching;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	493
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	494 /* Start is 2 when we have cycled completely and
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	495 * need to set the focus to the last widget we found
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	496 * that was valid.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	497 */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	498 if(start == 2)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	499 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	500 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	501 SetFocus(lasthwnd);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	502 return 0;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	503 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	504
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	505 /* Start is 1 when we are entering the function
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	506 * for the first time, it is zero when entering
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	507 * the function recursively.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	508 */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	509 if(start == 1)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	510 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	511 lasthwnd = handle;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	512 finish_searching = 0;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	513 firsthwnd = 0;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	514 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	515
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	516 for(z=box->count-1;z>-1;z--)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	517 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	518 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	519 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	520 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	521
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	522 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	523 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	524 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	525 else
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	526 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	527 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	528 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	529 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	530 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	531 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	532 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	533 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	534 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	535
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	536 /* 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	537 * 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	538 */
5c66a108aa47 Fixed 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 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	540 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	541 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	542 if(_validate_focus(box->items[z].hwnd))
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	543 {
58 5c66a108aa47 Fixed 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 /* 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	545 * 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	546 */
5c66a108aa47 Fixed 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 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	548 {
5c66a108aa47 Fixed 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 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	550 {
5c66a108aa47 Fixed 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 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	552 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	553 }
5c66a108aa47 Fixed 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
5c66a108aa47 Fixed 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 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	557 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	558
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	559 lasthwnd = _normalize_handle(box->items[z].hwnd);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	560 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	561 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	562 {
58 5c66a108aa47 Fixed 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 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	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 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	566
153 a371875d5486 Sync up with the latest F/X sources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 151 diff changeset	567 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	568 {
284 3431e445d831 Woops, screwed up the splitbar tab direction on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 283 diff changeset	569 /* 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	570 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	571
a371875d5486 Sync up with the latest F/X sources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 151 diff changeset	572 if(mybox)
a371875d5486 Sync up with the latest F/X sources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 151 diff changeset	573 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	574 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	575
a371875d5486 Sync up with the latest F/X sources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 151 diff changeset	576 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	577 return 1;
a371875d5486 Sync up with the latest F/X sources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 151 diff changeset	578 }
a371875d5486 Sync up with the latest F/X sources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 151 diff changeset	579
284 3431e445d831 Woops, screwed up the splitbar tab direction on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 283 diff changeset	580 /* 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	581 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	582
a371875d5486 Sync up with the latest F/X sources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 151 diff changeset	583 if(mybox)
a371875d5486 Sync up with the latest F/X sources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 151 diff changeset	584 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	585 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	586
a371875d5486 Sync up with the latest F/X sources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 151 diff changeset	587 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	588 return 1;
a371875d5486 Sync up with the latest F/X sources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 151 diff changeset	589 }
a371875d5486 Sync up with the latest F/X sources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 151 diff changeset	590 }
a371875d5486 Sync up with the latest F/X sources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 151 diff changeset	591 else if(strnicmp(tmpbuf, WC_TABCONTROL, strlen(WC_TABCONTROL))==0) /* Notebook */
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	592 {
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	593 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	594 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	595
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	596 if(pageid > -1 && array && array[pageid])
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	597 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	598 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	599
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	600 if(array[pageid]->hwnd)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	601 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	602 notebox = (Box *)GetWindowLongPtr(array[pageid]->hwnd, GWLP_USERDATA);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	603
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	604 if(notebox && _focus_check_box(notebox, handle, start == 3 ? 3 : 0, defaultitem))
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	605 return 1;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	606 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	607 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	608 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	609 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	610 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	611 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	612 return 0;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	613 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	614
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	615 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	616 {
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	617 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	618 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	619 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	620
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	621 /* 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	622 * 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	623 * 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	624 */
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	625 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	626 {
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	627 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	628 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	629 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	630 }
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
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 /* 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	633 * 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	634 * 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	635 */
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 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	637 {
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 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	639 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	640 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	641 }
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 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	644 {
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 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	646 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	647 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	648
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 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	650 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	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 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	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 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	655 {
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 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	657 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	658 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	659 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	660 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	661 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	662
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	663 /* 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	664 * 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	665 */
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 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	667 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	668 }
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 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	670 {
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 /* 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	672 * 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	673 */
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 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	675 {
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 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	677 {
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 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	679 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	680 }
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
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 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	684 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	685
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 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	687 }
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 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	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 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	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 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	693
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	694 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	695 {
284 3431e445d831 Woops, screwed up the splitbar tab direction on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 283 diff changeset	696 /* 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	697 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	698
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	699 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	700 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	701 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	702
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	703 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	704 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	705 }
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	706
284 3431e445d831 Woops, screwed up the splitbar tab direction on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 283 diff changeset	707 /* 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	708 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	709
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(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	711 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	712 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	713
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 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	715 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	716 }
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	717 }
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 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	719 {
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	720 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	721 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	722
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	723 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	724 {
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	725 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	726
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	727 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	728 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	729 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	730
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	731 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	732 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	733 }
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	734 }
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 }
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	736 }
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 }
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 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	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
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	742 /* This function finds the first widget in the
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	743 * layout and moves the current focus to it.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	744 */
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	745 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	746 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	747 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	748 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	749
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	750 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	751 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	752
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	753 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	754
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	755 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	756 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	757
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	758
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	759 if(handle)
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	760 thisbox = (Box *)GetWindowLongPtr(handle, GWLP_USERDATA);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	761
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	762 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	763 {
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	764 _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	765 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	766 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	767
301 887675ee5b67 More keypress fixes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 299 diff changeset	768 HWND _toplevel_window(HWND handle)
887675ee5b67 More keypress fixes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 299 diff changeset	769 {
887675ee5b67 More keypress fixes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 299 diff changeset	770 HWND box, lastbox = GetParent(handle);
887675ee5b67 More keypress fixes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 299 diff changeset	771
887675ee5b67 More keypress fixes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 299 diff changeset	772 /* Find the toplevel window */
887675ee5b67 More keypress fixes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 299 diff changeset	773 while((box = GetParent(lastbox)))
887675ee5b67 More keypress fixes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 299 diff changeset	774 {
887675ee5b67 More keypress fixes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 299 diff changeset	775 lastbox = box;
887675ee5b67 More keypress fixes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 299 diff changeset	776 }
887675ee5b67 More keypress fixes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 299 diff changeset	777 if(lastbox)
887675ee5b67 More keypress fixes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 299 diff changeset	778 return lastbox;
887675ee5b67 More keypress fixes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 299 diff changeset	779 return handle;
887675ee5b67 More keypress fixes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 299 diff changeset	780 }
887675ee5b67 More keypress fixes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 299 diff changeset	781
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	782 /* This function finds the current widget in the
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	783 * layout and moves the current focus to the next item.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	784 */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	785 void _shift_focus(HWND handle)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	786 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	787 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	788
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	789 HWND box, lastbox = GetParent(handle);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	790
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	791 /* 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	792 while((box = GetParent(lastbox)))
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	793 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	794 lastbox = box;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	795 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	796
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	797 thisbox = (Box *)GetWindowLongPtr(lastbox, GWLP_USERDATA);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	798 if(thisbox)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	799 {
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	800 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	801 _focus_check_box(thisbox, handle, 2, 0);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	802 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	803 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	804
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	805 /* 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	806 * 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	807 */
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	808 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	809 {
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	810 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	811
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	812 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	813
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	814 /* 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	815 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	816 {
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	817 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	818 }
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	819
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	820 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	821 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	822 {
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 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	824 _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	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 }
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
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	828 /* ResetWindow:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	829 * Resizes window to the exact same size to trigger
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	830 * recalculation of frame.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	831 */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	832 void _ResetWindow(HWND hwndFrame)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	833 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	834 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	835
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	836 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	837 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	838 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	839 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	840 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	841 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	842
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	843 /* This function calculates how much space the widgets and boxes require
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	844 * and does expansion as necessary.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	845 */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	846 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	847 int pass, int usedpadx, int usedpady)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	848 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	849 int z, currentx = 0, currenty = 0;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	850 int uymax = 0, uxmax = 0;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	851 int upymax = 0, upxmax = 0;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	852 /* Used for the SIZEEXPAND */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	853 int nux = usedx, nuy = usedy;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	854 int nupx = usedpadx, nupy = usedpady;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	855
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	856 (usedx) += (thisbox->pad 2);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	857 (usedy) += (thisbox->pad 2);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	858
416 a4197ddfc50d Changes to calculate groupbox border widths and take this into account bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 414 diff changeset	859 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	860 {
a4197ddfc50d Changes to calculate groupbox border widths and take this into account bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 414 diff changeset	861 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	862
456 935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	863 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	864
416 a4197ddfc50d Changes to calculate groupbox border widths and take this into account bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 414 diff changeset	865 if(text)
a4197ddfc50d Changes to calculate groupbox border widths and take this into account bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 414 diff changeset	866 {
456 935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	867 dw_font_text_extents(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	868 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	869 }
a4197ddfc50d Changes to calculate groupbox border widths and take this into account bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 414 diff changeset	870
456 935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	871 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	872 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	873 else
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	874 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	875
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	876 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	877
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	878 (*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	879 (*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	880 (*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	881 (*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	882 }
a4197ddfc50d Changes to calculate groupbox border widths and take this into account bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 414 diff changeset	883
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	884 for(z=0;z<thisbox->count;z++)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	885 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	886 if(thisbox->items[z].type == TYPEBOX)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	887 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	888 int initialx, initialy;
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	889 Box tmp = (Box )GetWindowLongPtr(thisbox->items[z].hwnd, GWLP_USERDATA);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	890
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	891 initialx = x - (*usedx);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	892 initialy = y - (*usedy);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	893
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	894 if(tmp)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	895 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	896 int newx, newy;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	897 int nux = usedx, nuy = usedy;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	898 int upx = usedpadx + (tmp->pad2), upy = usedpady + (tmp->pad2);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	899
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	900 /* 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	901 * 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	902 */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	903 if(pass == 2)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	904 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	905 int deep = *depth + 1;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	906
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	907 _resize_box(tmp, &deep, x, y, &nux, &nuy, 1, &upx, &upy);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	908
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	909 tmp->upx = upx - *usedpadx;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	910 tmp->upy = upy - *usedpady;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	911
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	912 newx = x - nux;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	913 newy = y - nuy;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	914
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	915 tmp->width = thisbox->items[z].width = initialx - newx;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	916 tmp->height = thisbox->items[z].height = initialy - newy;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	917
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	918 tmp->parentxratio = thisbox->xratio;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	919 tmp->parentyratio = thisbox->yratio;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	920
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	921 tmp->parentpad = tmp->pad;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	922
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	923 /* Just in case */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	924 tmp->xratio = thisbox->xratio;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	925 tmp->yratio = thisbox->yratio;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	926
456 935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	927 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	928 {
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	929 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	930
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	931 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	932 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	933 }
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	934 else
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	935 {
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	936 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	937 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	938 }
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	939 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	940 {
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	941 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	942
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->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	944 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	945 }
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	946 else
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	947 {
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	948 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	949 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	950 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	951
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	952 nux = usedx; nuy = usedy;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	953 upx = usedpadx + (tmp->pad2); upy = usedpady + (tmp->pad2);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	954 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	955
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	956 (*depth)++;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	957
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	958 _resize_box(tmp, depth, x, y, &nux, &nuy, pass, &upx, &upy);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	959
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	960 (*depth)--;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	961
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	962 newx = x - nux;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	963 newy = y - nuy;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	964
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	965 tmp->minwidth = thisbox->items[z].width = initialx - newx;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	966 tmp->minheight = thisbox->items[z].height = initialy - newy;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	967 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	968 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	969
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	970 if(pass > 1 && *depth > 0)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	971 {
456 935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	972 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	973 {
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	974 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	975
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	976 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	977 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	978 else
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	979 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	980 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	981 else
456 935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	982 {
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	983 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	984 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	985 else
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	986 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	987 }
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	988
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	989 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	990 {
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	991 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	992
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	993 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	994 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	995 else
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	996 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	997 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	998 else
456 935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	999 {
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	1000 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	1001 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	1002 else
935436731b41 Hybrid fix, seems the last change illiminated some important code that bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 455 diff changeset	1003 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	1004 }
22 6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	1005
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	1006 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	1007 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	1008 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	1009
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	1010 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	1011 {
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	1012 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	1013 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	1014 }
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	1015 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1016 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1017 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1018 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1019 thisbox->items[z].xratio = thisbox->xratio;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1020 thisbox->items[z].yratio = thisbox->yratio;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1021 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1022
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	1023 if(thisbox->type == DW_VERT)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1024 {
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	1025 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	1026
cf00d6e2b3cc Optimizations to the layout engine on OS/2 and Windows, eliminated 3 MUL bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 451 diff changeset	1027 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	1028 uxmax = itemwidth;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1029 if(thisbox->items[z].hsize != SIZEEXPAND)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1030 {
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	1031 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	1032 upxmax = itemwidth;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1033 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1034 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1035 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1036 if(thisbox->items[z].pad*2 > upxmax)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1037 upxmax = thisbox->items[z].pad*2;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1038 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1039 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1040 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1041 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1042 if(thisbox->items[z].width == -1)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1043 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1044 /* figure out how much space this item requires */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1045 /* thisbox->items[z].width = */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1046 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1047 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1048 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1049 (usedx) += thisbox->items[z].width + (thisbox->items[z].pad2);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1050 if(thisbox->items[z].hsize != SIZEEXPAND)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1051 (usedpadx) += (thisbox->items[z].pad2) + thisbox->items[z].width;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1052 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1053 (usedpadx) += thisbox->items[z].pad2;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1054 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1055 }
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	1056 if(thisbox->type == DW_HORZ)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1057 {
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	1058 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	1059
cf00d6e2b3cc Optimizations to the layout engine on OS/2 and Windows, eliminated 3 MUL bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 451 diff changeset	1060 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	1061 uymax = itemheight;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1062 if(thisbox->items[z].vsize != SIZEEXPAND)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1063 {
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	1064 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	1065 upymax = itemheight;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1066 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1067 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1068 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1069 if(thisbox->items[z].pad*2 > upymax)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1070 upymax = thisbox->items[z].pad*2;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1071 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1072 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1073 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1074 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1075 if(thisbox->items[z].height == -1)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1076 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1077 /* figure out how much space this item requires */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1078 /* thisbox->items[z].height = */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1079 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1080 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1081 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1082 (usedy) += thisbox->items[z].height + (thisbox->items[z].pad2);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1083 if(thisbox->items[z].vsize != SIZEEXPAND)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1084 (usedpady) += (thisbox->items[z].pad2) + thisbox->items[z].height;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1085 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1086 (usedpady) += thisbox->items[z].pad2;
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 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1090
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1091 (*usedx) += uxmax;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1092 (*usedy) += uymax;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1093 (*usedpadx) += upxmax;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1094 (*usedpady) += upymax;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1095
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1096 currentx += thisbox->pad;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1097 currenty += thisbox->pad;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1098
416 a4197ddfc50d Changes to calculate groupbox border widths and take this into account bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 414 diff changeset	1099 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	1100 {
a4197ddfc50d Changes to calculate groupbox border widths and take this into account bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 414 diff changeset	1101 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	1102 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	1103 }
a4197ddfc50d Changes to calculate groupbox border widths and take this into account bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 414 diff changeset	1104
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1105 /* The second pass is for expansion and actual placement. */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1106 if(pass > 1)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1107 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1108 /* Any SIZEEXPAND items should be set to uxmax/uymax */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1109 for(z=0;z<thisbox->count;z++)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1110 {
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	1111 if(thisbox->items[z].hsize == SIZEEXPAND && thisbox->type == DW_VERT)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1112 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	1113 if(thisbox->items[z].vsize == SIZEEXPAND && thisbox->type == DW_HORZ)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1114 thisbox->items[z].height = uymax-(thisbox->items[z].pad*2);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1115 /* 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	1116 if(thisbox->items[z].type == TYPEBOX)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1117 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	1118 Box tmp = (Box )GetWindowLongPtr(thisbox->items[z].hwnd, GWLP_USERDATA);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1119
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1120 if(tmp)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1121 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1122 if(*depth > 0)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1123 {
425 4fe2df53ec9f Division by zero fix in the layout engine. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 421 diff changeset	1124 float calcval;
4fe2df53ec9f Division by zero fix in the layout engine. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 421 diff changeset	1125
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	1126 if(thisbox->type == DW_VERT)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1127 {
425 4fe2df53ec9f Division by zero fix in the layout engine. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 421 diff changeset	1128 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	1129 if(calcval == 0.0)
4fe2df53ec9f Division by zero fix in the layout engine. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 421 diff changeset	1130 tmp->xratio = thisbox->xratio;
4fe2df53ec9f Division by zero fix in the layout engine. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 421 diff changeset	1131 else
4fe2df53ec9f Division by zero fix in the layout engine. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 421 diff changeset	1132 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	1133 tmp->width = thisbox->items[z].width;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1134 }
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	1135 if(thisbox->type == DW_HORZ)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1136 {
425 4fe2df53ec9f Division by zero fix in the layout engine. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 421 diff changeset	1137 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	1138 if(calcval == 0.0)
4fe2df53ec9f Division by zero fix in the layout engine. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 421 diff changeset	1139 tmp->yratio = thisbox->yratio;
4fe2df53ec9f Division by zero fix in the layout engine. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 421 diff changeset	1140 else
4fe2df53ec9f Division by zero fix in the layout engine. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 421 diff changeset	1141 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	1142 tmp->height = thisbox->items[z].height;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1143 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1144 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1145
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1146 (*depth)++;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1147
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1148 _resize_box(tmp, depth, x, y, &nux, &nuy, 3, &nupx, &nupy);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1149
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1150 (*depth)--;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1151
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1152 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1153 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1154 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1155
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1156 for(z=0;z<(thisbox->count);z++)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1157 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1158 int height = thisbox->items[z].height;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1159 int width = thisbox->items[z].width;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1160 int pad = thisbox->items[z].pad;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1161 HWND handle = thisbox->items[z].hwnd;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1162 int vectorx, vectory;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1163
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1164 /* When upxmax != pad2 then ratios are incorrect. /
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1165 vectorx = (int)((width*thisbox->items[z].xratio)-width);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1166 vectory = (int)((height*thisbox->items[z].yratio)-height);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1167
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1168 if(width > 0 && height > 0)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1169 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1170 char tmpbuf[100];
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1171 /* This is a hack to fix rounding of the sizing */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1172 if(*depth == 0)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1173 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1174 vectorx++;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1175 vectory++;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1176 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1177
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1178 /* If this item isn't going to expand... reset the vectors to 0 */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1179 if(thisbox->items[z].vsize != SIZEEXPAND)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1180 vectory = 0;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1181 if(thisbox->items[z].hsize != SIZEEXPAND)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1182 vectorx = 0;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1183
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1184 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	1185
88 58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1186 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	1187 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1188 /* 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	1189 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	1190 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	1191 }
88 58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1192 else if(strnicmp(tmpbuf, UPDOWN_CLASS, strlen(UPDOWN_CLASS)+1)==0)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1193 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1194 /* Handle special case Spinbutton */
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	1195 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	1196
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1197 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	1198 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	1199
5c66a108aa47 Fixed 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 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	1201 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1202 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	1203 (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	1204 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1205 }
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	1206 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	1207 {
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	1208 /* 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	1209 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	1210 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	1211 int cx = width + vectorx;
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	1212 int cy = height + vectory;
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	1213
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	1214 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	1215 cx, cy, FALSE);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	1216
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	1217 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	1218 _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	1219 }
88 58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1220 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	1221 {
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1222 /* 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	1223 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	1224
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1225 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	1226 {
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1227 /* 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	1228 char tmpbuf[1024];
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1229 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	1230
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1231 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	1232
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1233 /* Figure out how big the text is */
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1234 dw_font_text_extents(handle, 0, tmpbuf, 0, &textheight);
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1235
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1236 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	1237
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1238 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	1239 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	1240 }
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1241 else
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 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	1244 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	1245 }
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	1246 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1247 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1248 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1249 /* 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	1250 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	1251 width + vectorx, height + vectory, FALSE);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1252 if(thisbox->items[z].type == TYPEBOX)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1253 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	1254 Box boxinfo = (Box )GetWindowLongPtr(handle, GWLP_USERDATA);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1255
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1256 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	1257 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	1258 width + vectorx, height + vectory, FALSE);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1259
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1260 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1261 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1262
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1263 /* 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	1264 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	1265 {
5c66a108aa47 Fixed 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 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	1267 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	1268 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	1269
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1270 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	1271 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1272 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	1273 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	1274 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	1275 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	1276 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1277 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1278
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	1279 if(thisbox->type == DW_HORZ)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1280 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	1281 if(thisbox->type == DW_VERT)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1282 currenty += height + vectory + (pad * 2);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1283 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1284 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1285 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1286 return 0;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1287 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1288
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1289 void _do_resize(Box *thisbox, int x, int y)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1290 {
17 f26eced21a30 Some more updates. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 15 diff changeset	1291 if(x != 0 && y != 0)
f26eced21a30 Some more updates. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 15 diff changeset	1292 {
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1293 if(thisbox)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1294 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1295 int usedx = 0, usedy = 0, depth = 0, usedpadx = 0, usedpady = 0;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1296
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1297 _resize_box(thisbox, &depth, x, y, &usedx, &usedy, 1, &usedpadx, &usedpady);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1298
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	1299 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	1300 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	1301
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1302 thisbox->xratio = ((float)(x-usedpadx))/((float)(usedx-usedpadx));
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1303 thisbox->yratio = ((float)(y-usedpady))/((float)(usedy-usedpady));
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1304
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1305 usedpadx = usedpady = usedx = usedy = depth = 0;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1306
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1307 _resize_box(thisbox, &depth, x, y, &usedx, &usedy, 2, &usedpadx, &usedpady);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1308 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1309 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1310 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1311
211 e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1312 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	1313 {
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1314 SCROLLINFO si;
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1315
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1316 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	1317 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	1318
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1319 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	1320
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1321 switch(which)
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1322 {
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1323 case SB_THUMBTRACK:
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1324 return pos;
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1325 /case SB_PAGEDOWN:/
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1326 case SB_PAGELEFT:
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1327 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	1328 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	1329 pos = si.nMin;
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1330 return pos;
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1331 /case SB_PAGEUP:/
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1332 case SB_PAGERIGHT:
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1333 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	1334 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	1335 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	1336 return pos;
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1337 /case SB_LINEDOWN:/
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1338 case SB_LINELEFT:
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1339 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	1340 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	1341 pos = si.nMin;
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1342 return pos;
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1343 /case SB_LINEUP:/
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1344 case SB_LINERIGHT:
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1345 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	1346 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	1347 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	1348 return pos;
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1349 }
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1350 return -1;
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1351 }
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1352
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	1353 #ifndef WINNT_COMPAT
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1354 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	1355 {
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1356 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	1357
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1358 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	1359 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	1360
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1361 if(GetMenuInfo(menu, &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	1362 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	1363 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	1364 }
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1365
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1366 /* 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	1367 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	1368 {
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 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	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 /* 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	1372 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	1373 {
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 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	1375 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	1376 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	1377 }
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 #endif
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
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1382 /* 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	1383 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	1384 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1385 int 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	1386 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	1387 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	1388 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	1389 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	1390
295 aac3ab26d636 More key_press cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 294 diff changeset	1391 /* Deal with translating some messages */
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1392 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	1393 msg = WM_LBUTTONDOWN;
295 aac3ab26d636 More key_press cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 294 diff changeset	1394 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	1395 msg = WM_LBUTTONUP;
295 aac3ab26d636 More key_press cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 294 diff changeset	1396 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	1397 msg = WM_VSCROLL;
451 538b529052e0 Allow all special keys with keypress callback. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 449 diff changeset	1398 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	1399 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	1400
5c66a108aa47 Fixed 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 if(result == -1)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1402 {
58 5c66a108aa47 Fixed 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 /* 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	1404 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	1405
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1406 /* 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	1407 while(tmp)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1408 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1409 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	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 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	1412 {
197 f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	1413 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	1414 {
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	1415 int (timerfunc)(void ) = tmp->signalfunction;
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	1416 if(tmp->id == (int)mp1)
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	1417 {
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	1418 if(!timerfunc(tmp->data))
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	1419 dw_timer_disconnect(tmp->id);
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	1420 tmp = NULL;
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	1421 }
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	1422 result = 0;
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	1423 }
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	1424 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	1425 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	1426 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1427 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	1428
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1429 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	1430 {
5c66a108aa47 Fixed 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 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	1432 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	1433 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1434 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1435 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	1436 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	1437 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1438 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	1439
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1440 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	1441 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1442 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	1443 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	1444 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1445 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1446 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	1447 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	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 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	1450 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	1451
5c66a108aa47 Fixed 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 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	1453 {
5c66a108aa47 Fixed 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 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	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 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	1457 {
5c66a108aa47 Fixed 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_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	1459 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	1460 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	1461 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	1462 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	1463 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	1464 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	1465 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	1466 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	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 result = buttonfunc(tmp->window, pts.x, pts.y, button, 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	1469 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	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 }
5c66a108aa47 Fixed 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 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	1473 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	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 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	1476 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	1477
5c66a108aa47 Fixed 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 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	1479 {
5c66a108aa47 Fixed 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 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	1481
5c66a108aa47 Fixed 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 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	1483 {
5c66a108aa47 Fixed 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 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	1485 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	1486 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	1487 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	1488 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	1489 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	1490 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	1491 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	1492 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	1493 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1494 result = buttonfunc(tmp->window, pts.x, pts.y, button, 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	1495 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	1496 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1497 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1498 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	1499 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	1500 {
5c66a108aa47 Fixed 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 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	1502 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	1503
5c66a108aa47 Fixed 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 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	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 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	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 (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	1509 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	1510 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	1511 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	1512 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	1513 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	1514
5c66a108aa47 Fixed 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 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	1516 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	1517 }
5c66a108aa47 Fixed 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 }
5c66a108aa47 Fixed 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_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	1521 {
267 bf8b907f8a29 Added initial version of updated key_press_event callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 257 diff changeset	1522 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	1523
301 887675ee5b67 More keypress fixes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 299 diff changeset	1524 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	1525 {
267 bf8b907f8a29 Added initial version of updated key_press_event callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 257 diff changeset	1526 int special = 0;
295 aac3ab26d636 More key_press cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 294 diff changeset	1527 char ch = 0;
267 bf8b907f8a29 Added initial version of updated key_press_event callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 257 diff changeset	1528
bf8b907f8a29 Added initial version of updated key_press_event callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 257 diff changeset	1529 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	1530 special \|= KC_SHIFT;
bf8b907f8a29 Added initial version of updated key_press_event callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 257 diff changeset	1531 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	1532 special \|= KC_CTRL;
bf8b907f8a29 Added initial version of updated key_press_event callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 257 diff changeset	1533 if(mp2 & (1 << 29))
bf8b907f8a29 Added initial version of updated key_press_event callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 257 diff changeset	1534 special \|= KC_ALT;
bf8b907f8a29 Added initial version of updated key_press_event callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 257 diff changeset	1535
295 aac3ab26d636 More key_press cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 294 diff changeset	1536 if(origmsg == WM_CHAR && mp1 < 128)
aac3ab26d636 More key_press cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 294 diff changeset	1537 ch = (char)mp1;
aac3ab26d636 More key_press cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 294 diff changeset	1538
aac3ab26d636 More key_press cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 294 diff changeset	1539 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	1540 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	1541 }
5c66a108aa47 Fixed 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 }
5c66a108aa47 Fixed 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 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	1544 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	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 (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	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(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	1549 {
5c66a108aa47 Fixed 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 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	1551 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	1552 }
5c66a108aa47 Fixed 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 }
5c66a108aa47 Fixed 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 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	1555 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	1556 {
5c66a108aa47 Fixed 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 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	1558 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	1559 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	1560
5c66a108aa47 Fixed 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 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	1562 {
5c66a108aa47 Fixed 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 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	1564 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	1565 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	1566 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	1567 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	1568 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	1569 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	1570 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1571 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1572 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	1573 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	1574 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1575 if(tmp->message == TVN_SELCHANGED \|\| 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	1576 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1577 NMTREEVIEW FAR tem=(NMTREEVIEW 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	1578 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	1579
5c66a108aa47 Fixed 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 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	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 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	1583 {
5c66a108aa47 Fixed 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 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	1585 {
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	1586 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	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 int (treeselectfunc)(HWND, HWND, char , void , 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	1589 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	1590 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	1591
5c66a108aa47 Fixed 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 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	1593 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	1594
5c66a108aa47 Fixed 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 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	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 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	1598 if(ptrs)
311 24c1dfffe97e Unified the callback functions for tree and container widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 310 diff changeset	1599 result = treeselectfunc(tmp->window, (HWND)tem->itemNew.hItem, (char )ptrs[0], tmp->data, (void )ptrs[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	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 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	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 }
5c66a108aa47 Fixed 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 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	1605 {
5c66a108aa47 Fixed 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 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	1607 {
5c66a108aa47 Fixed 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 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	1609 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	1610 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	1611 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	1612 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	1613 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	1614
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1615 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	1616
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1617 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	1618 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	1619
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1620 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	1621
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	1622 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	1623 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	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(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	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 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	1628 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	1629
5c66a108aa47 Fixed 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 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	1631 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	1632
5c66a108aa47 Fixed 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 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	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 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	1636 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	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 }
5c66a108aa47 Fixed 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 }
161 c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1640 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	1641 {
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1642 if(tem->hdr.code == LVN_ITEMCHANGED && tmp->message == TVN_SELCHANGED)
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1643 {
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1644 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	1645 {
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1646 LV_ITEM lvi;
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1647 int iItem;
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1648
350 2216e65ad2ae Removed slider flags and container selection flags from the header file. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 346 diff changeset	1649 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	1650
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1651 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	1652
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1653 if(iItem > -1)
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1654 {
311 24c1dfffe97e Unified the callback functions for tree and container widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 310 diff changeset	1655 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	1656
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1657 lvi.iItem = iItem;
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1658 lvi.mask = LVIF_PARAM;
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1659
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1660 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	1661
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1662 /* 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	1663 if(lvi.lParam < 100)
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1664 lvi.lParam = 0;
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1665
311 24c1dfffe97e Unified the callback functions for tree and container widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 310 diff changeset	1666 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	1667 tmp = NULL;
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1668 }
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1669 }
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1670 }
c555d06b6c93 Allow tree-select signal to work on container controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 157 diff changeset	1671 }
58 5c66a108aa47 Fixed 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 }
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	1673 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	1674 {
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	1675 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	1676 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	1677 {
346 81fae15885d7 Implemented switch-page on OS/2, and changed the signal prototype to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 344 diff changeset	1678 int (switchpagefunc)(HWND, unsigned long, void ) = tmp->signalfunction;
81fae15885d7 Implemented switch-page on OS/2, and changed the signal prototype to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 344 diff changeset	1679 unsigned long num=dw_notebook_page_query(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	1680 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	1681 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	1682 }
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	1683 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1684 }
5c66a108aa47 Fixed 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 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	1686 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	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 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	1689 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	1690 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	1691 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	1692
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1693 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	1694
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1695 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	1696 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1697 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	1698
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1699 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	1700 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1701 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	1702 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	1703 }
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	1704 }
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1705 #ifndef WINNT_COMPAT
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1706 else if(tmp->id && passthru == tmp->id)
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1707 {
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1708 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	1709
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1710 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	1711 {
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	1712 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	1713 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	1714 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1715 } /* Make sure it's the right window, and the right 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	1716 #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	1717 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	1718 {
93 98cce029a611 Changed handling of menu item click events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 90 diff changeset	1719 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	1720 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	1721 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1722 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1723 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	1724 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	1725 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	1726 {
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1727 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	1728 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	1729 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	1730
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1731 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	1732
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1733 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	1734 {
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1735
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1736 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	1737 {
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1738 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	1739 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	1740 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	1741
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1742 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	1743 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	1744 else
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1745 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	1746 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	1747 }
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1748 }
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	1749 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	1750 {
211 e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1751 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	1752 {
211 e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1753 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	1754
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1755 if(value > -1)
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1756 {
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1757 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	1758 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	1759 }
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	1760 tmp = NULL;
211 e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1761 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	1762 }
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	1763 }
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1764 }
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	1765 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	1766 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1767 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1768 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	1769 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	1770 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1771 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	1772 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1773
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1774 /* 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	1775 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	1776 {
5c66a108aa47 Fixed 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 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	1778 {
5c66a108aa47 Fixed 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 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	1780
5c66a108aa47 Fixed 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 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	1782 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	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;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1785 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	1786 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1787 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	1788 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	1789
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1790 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	1791 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	1792 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	1793
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1794 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	1795 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1796 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	1797 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	1798 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	1799
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1800 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	1801 _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	1802 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	1803 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	1804 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1805 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1806 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1807 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	1808 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	1809 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	1810 {
82 aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	1811 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	1812 _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	1813 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	1814 _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	1815 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	1816 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1817 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	1818 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	1819 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	1820
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1821 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	1822 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	1823 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	1824 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	1825 _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	1826 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	1827 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	1828 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	1829 {
5c66a108aa47 Fixed 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 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	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 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	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 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	1835 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	1836
5c66a108aa47 Fixed 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 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	1838 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	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 }
5c66a108aa47 Fixed 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 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	1842 {
5c66a108aa47 Fixed 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 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	1844 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	1845
5c66a108aa47 Fixed 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 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	1847 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	1848
5c66a108aa47 Fixed 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 _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	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 }
5c66a108aa47 Fixed 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 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	1853 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	1854 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	1855 {
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	1856 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	1857
211 e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1858 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	1859 {
211 e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1860 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	1861
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1862 if(value > -1)
e57c182cac64 Automatically scroll when getting PAGE and LINE messages, not just bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 209 diff changeset	1863 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	1864 }
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	1865 }
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	1866 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	1867 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	1868 {
5c66a108aa47 Fixed 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 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	1870 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	1871 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	1872 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	1873 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1874 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	1875 case WM_DESTROY:
5c66a108aa47 Fixed 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 /* Free memory before destroying */
5c66a108aa47 Fixed 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 _free_window_memory(hWnd, 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	1878 EnumChildWindows(hWnd, _free_window_memory, 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	1879 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	1880 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	1881 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	1882 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	1883 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	1884 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	1885 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	1886 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	1887 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	1888 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	1889 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	1890 {
155 840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1891 /* Handle foreground */
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1892 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	1893 {
155 840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1894 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	1895 {
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1896 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	1897 _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	1898 _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	1899 }
58 5c66a108aa47 Fixed 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 }
155 840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1901 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	1902 {
5c66a108aa47 Fixed 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 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	1904 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	1905 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	1906 }
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1907 /* Handle background */
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1908 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	1909 {
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1910 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	1911 {
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1912 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	1913
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1914 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	1915 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	1916 }
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1917 else
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1918 {
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1919 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	1920 _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	1921 _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	1922 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	1923 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	1924 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	1925 _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	1926 _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	1927 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	1928 }
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1929 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	1930 }
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1931 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	1932 {
58 5c66a108aa47 Fixed 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 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	1934 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	1935 DW_BLUE_VALUE(thiscinfo->back)));
82 aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	1936 if(thiscinfo->hbrush)
aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	1937 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	1938 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	1939 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	1940 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	1941 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	1942 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	1943 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1944 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1945
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1946 }
5c66a108aa47 Fixed 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;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1948 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1949 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	1950 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	1951 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	1952 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	1953 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1954
461 12ba7e744560 Fixes timer problems on Windows, however this may break Win95 support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 456 diff changeset	1955 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	1956 {
12ba7e744560 Fixes timer problems on Windows, however this may break Win95 support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 456 diff changeset	1957 _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	1958 }
12ba7e744560 Fixes timer problems on Windows, however this may break Win95 support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 456 diff changeset	1959
58 5c66a108aa47 Fixed 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 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	1961 {
5c66a108aa47 Fixed 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 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	1963 {
5c66a108aa47 Fixed 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_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	1965 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	1966 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	1967 SetActiveWindow(hWnd);
106 4b6799f3dbbc Give the frame window focus if it is clicked on. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 105 diff changeset	1968 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	1969 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	1970 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	1971 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	1972 _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	1973 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	1974 #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	1975 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	1976 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	1977 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	1978
5c66a108aa47 Fixed 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 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	1980 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	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 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	1983 #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	1984 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	1985 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	1986 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	1987
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1988 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	1989 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	1990 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	1991 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	1992 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	1993
155 840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1994 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	1995 {
155 840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1996 /* Handle foreground */
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1997 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	1998 {
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	1999 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	2000 {
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2001 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	2002 _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	2003 _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	2004 }
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2005 }
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2006 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	2007 {
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2008 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	2009 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	2010 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	2011 }
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2012 /* Handle background */
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2013 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	2014 {
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2015 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	2016 {
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2017 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	2018 _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	2019 _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	2020 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	2021 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	2022 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	2023 _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	2024 _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	2025 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	2026 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	2027 success = TRUE;
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2028 }
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2029 }
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2030 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	2031 {
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2032 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	2033 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	2034 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	2035 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	2036 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	2037 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	2038 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	2039 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	2040 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	2041 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	2042 success = TRUE;
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2043 }
58 5c66a108aa47 Fixed 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 }
5c66a108aa47 Fixed 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
5c66a108aa47 Fixed 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 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	2047 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	2048 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	2049 }
5c66a108aa47 Fixed 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
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2051 }
5c66a108aa47 Fixed 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 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	2053 }
5c66a108aa47 Fixed 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 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	2055 }
5c66a108aa47 Fixed 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
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2057 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	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 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	2060 {
5c66a108aa47 Fixed 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 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	2062 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	2063 case WM_RBUTTONDOWN:
267 bf8b907f8a29 Added initial version of updated key_press_event callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 257 diff changeset	2064 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	2065 _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	2066 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	2067 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	2068 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	2069 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	2070 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	2071 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	2072 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	2073 case WM_COMMAND:
267 bf8b907f8a29 Added initial version of updated key_press_event callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 257 diff changeset	2074 case WM_CHAR:
295 aac3ab26d636 More key_press cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 294 diff changeset	2075 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	2076 _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	2077 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	2078 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2079 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	2080 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2081
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2082 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	2083 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2084 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	2085
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	2086 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	2087
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2088 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	2089 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2090 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	2091 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2092 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	2093 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	2094 case WM_RBUTTONDOWN:
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2095 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	2096 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2097 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	2098
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2099 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	2100 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	2101 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	2102
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2103 /* 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	2104 * 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	2105 */
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2106 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	2107 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	2108
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2109 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	2110
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2111 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	2112 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2113 break;
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2114 case WM_LBUTTONUP:
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2115 case WM_MBUTTONUP:
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2116 case WM_RBUTTONUP:
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2117 case WM_KEYUP:
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2118 {
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2119 BOOL ret;
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2120
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2121 if(!cinfo \|\| !cinfo->pOldProc)
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2122 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	2123 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	2124
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2125 /* 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	2126 * 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	2127 */
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2128 if(cinfo && cinfo->buddy)
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2129 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	2130
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2131 KillTimer(hWnd, 100);
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2132
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2133 return ret;
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2134 }
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2135 break;
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2136 case WM_TIMER:
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2137 {
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2138 if(mp1 == 100)
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2139 {
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2140 BOOL ret;
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2141
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2142 if(cinfo && cinfo->buddy)
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2143 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	2144
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2145 if(!cinfo \|\| !cinfo->pOldProc)
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2146 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	2147 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	2148
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2149 /* 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	2150 * 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	2151 */
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2152 if(cinfo && cinfo->buddy)
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2153 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	2154
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2155 return ret;
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2156 }
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2157 }
94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2158 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	2159 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	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 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	2162 {
5c66a108aa47 Fixed 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 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	2164 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	2165
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2166 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	2167
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2168 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	2169
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	2170 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	2171 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	2172 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	2173 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	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 }
5c66a108aa47 Fixed 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 break;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2177 }
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	2178 }
58 5c66a108aa47 Fixed 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 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	2181 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	2182 return CallWindowProc(cinfo->pOldProc, hWnd, msg, mp1, mp2);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2183 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2184
40 88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2185 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	2186 {
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2187 char tmpbuf[100];
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2188
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2189 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	2190
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2191 /* 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	2192 * obtain input focus.
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 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 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	2195 {
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2196 /* 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	2197 SignalHandler *tmp = Root;
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2198
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2199 /* 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	2200 while(tmp)
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2201 {
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2202 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	2203 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2204 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	2205
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2206 /* 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	2207 if(tmp->window == handle)
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2208 {
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2209 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	2210 tmp = NULL;
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2211 }
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2212 }
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2213 if(tmp)
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2214 tmp= tmp->next;
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2215 }
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2216 }
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	2217 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	2218 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	2219 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2220
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2221 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	2222 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2223 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	2224 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	2225 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	2226
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	2227 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	2228
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2229 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	2230 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	2231 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	2232
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2233 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	2234 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2235 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	2236
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2237 switch( msg )
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2238 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2239 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	2240 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	2241 _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	2242 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	2243 _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	2244 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	2245 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	2246 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	2247 _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	2248 break;
110 d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2249 case WM_KEYDOWN:
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2250 case WM_KEYUP:
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2251 {
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2252 if(mp1 == VK_UP \|\| mp1 == VK_DOWN)
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2253 {
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2254 BOOL ret;
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2255
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2256 if(!cinfo \|\| !cinfo->pOldProc)
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2257 ret = DefWindowProc(hWnd, msg, mp1, mp2);
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2258 ret = CallWindowProc(cinfo->pOldProc, hWnd, msg, mp1, mp2);
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2259
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2260 /* Tell the spinner control that a keypress has
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2261 * occured and to update it's internal value.
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2262 */
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2263 if(cinfo && cinfo->buddy && !cinfo->combo)
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2264 PostMessage(hWnd, WM_USER+10, 0, 0);
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2265
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2266 if(msg == WM_KEYDOWN)
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2267 SetTimer(hWnd, 101, 100, (TIMERPROC)NULL);
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2268 else
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2269 KillTimer(hWnd, 101);
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2270
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2271 return ret;
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2272 }
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2273 }
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2274 break;
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2275 case WM_TIMER:
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2276 {
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2277 if(mp1 == 101)
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2278 {
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2279 BOOL ret;
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2280
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2281 if(!cinfo \|\| !cinfo->pOldProc)
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2282 ret = DefWindowProc(hWnd, msg, mp1, mp2);
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2283 ret = CallWindowProc(cinfo->pOldProc, hWnd, msg, mp1, mp2);
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2284
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2285 /* Tell the spinner control that a keypress has
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2286 * occured and to update it's internal value.
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2287 */
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2288 if(cinfo && cinfo->buddy && !cinfo->combo)
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2289 PostMessage(hWnd, WM_USER+10, 0, 0);
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2290
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2291 return ret;
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2292 }
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2293 }
d4c1a9ebc72f Spinbutton behaviour cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 109 diff changeset	2294 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	2295 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	2296 _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	2297 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	2298 {
82 aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	2299 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	2300 {
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	2301 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	2302 _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	2303 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	2304 _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	2305 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	2306 _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	2307 }
58 5c66a108aa47 Fixed 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 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	2309 {
4a02842f8074 Added shift-tab and up/down/left/right button support. And added missing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 60 diff changeset	2310 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	2311 _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	2312 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	2313 _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	2314 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	2315 _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	2316 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2317 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	2318 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2319 else if(LOWORD(mp1) == '\r')
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2320 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2321 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	2322 _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	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 }
111 1e406d67b178 Readded a piece of code I accidentally removed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 110 diff changeset	2325
1e406d67b178 Readded a piece of code I accidentally removed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 110 diff changeset	2326 /* 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	2327 * 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	2328 */
1e406d67b178 Readded a piece of code I accidentally removed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 110 diff changeset	2329 if(cinfo->buddy && !cinfo->combo)
1e406d67b178 Readded a piece of code I accidentally removed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 110 diff changeset	2330 {
1e406d67b178 Readded a piece of code I accidentally removed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 110 diff changeset	2331 if(IsWinNT())
1e406d67b178 Readded a piece of code I accidentally removed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 110 diff changeset	2332 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	2333 else
1e406d67b178 Readded a piece of code I accidentally removed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 110 diff changeset	2334 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	2335 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2336 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	2337 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	2338 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2339 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	2340 {
79 8082cb0e7c2e Updated to the latest DW. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 75 diff changeset	2341 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	2342
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	2343 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	2344 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	2345 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	2346 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	2347
79 8082cb0e7c2e Updated to the latest DW. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 75 diff changeset	2348 sprintf(tmpbuf, "%d", val);
8082cb0e7c2e Updated to the latest DW. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 75 diff changeset	2349 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	2350 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2351 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2352 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	2353 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	2354 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	2355 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	2356 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	2357 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	2358 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	2359 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	2360 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	2361 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	2362 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	2363 {
155 840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2364 /* Handle foreground */
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2365 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	2366 {
155 840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2367 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	2368 {
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2369 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	2370 _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	2371 _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	2372 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2373 }
155 840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2374 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	2375 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2376 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	2377 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	2378 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	2379 }
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2380 /* Handle background */
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2381 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	2382 {
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2383 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	2384 {
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2385 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	2386
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2387 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	2388
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2389
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2390 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	2391 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	2392 }
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2393 else
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2394 {
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2395 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	2396 _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	2397 _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	2398 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	2399 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	2400 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	2401 _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	2402 _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	2403 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	2404 }
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2405 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	2406 }
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	2407 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	2408 {
58 5c66a108aa47 Fixed 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 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	2410 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	2411 DW_BLUE_VALUE(thiscinfo->back)));
82 aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	2412 if(thiscinfo->hbrush)
aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	2413 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	2414 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	2415 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	2416 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	2417 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	2418 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	2419 }
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	2420 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2421
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: 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;
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	2424 }
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	2425 }
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	2426
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2427 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	2428 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	2429 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	2430 }
5c66a108aa47 Fixed 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
5c66a108aa47 Fixed 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 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	2433 {
5c66a108aa47 Fixed 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 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	2435
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	2436 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	2437
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	2438 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	2439 {
58 5c66a108aa47 Fixed 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_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	2441 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	2442 _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	2443 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	2444 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	2445 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	2446 {
58 5c66a108aa47 Fixed 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 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	2448 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	2449
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2450 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	2451 {
82 aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	2452 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	2453 _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	2454 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	2455 _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	2456 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	2457 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2458
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2459 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	2460 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	2461
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2462 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	2463
69 9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	2464 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	2465
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2466 if(iItem > -1)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2467 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2468 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	2469 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	2470
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2471 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	2472 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2473
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2474 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2475 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	2476
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2477 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	2478 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2479 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	2480 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2481 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	2482
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2483 /* 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	2484 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	2485 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	2486
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2487 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	2488 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	2489 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2490 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	2491 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	2492 }
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	2493 }
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	2494 }
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	2495 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	2496 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	2497 {
58 5c66a108aa47 Fixed 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 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	2499
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2500 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	2501 {
58 5c66a108aa47 Fixed 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 if(tmp->message == NM_RCLICK && tmp->window == hWnd)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2503 {
312 ff8f23594b15 Make sure itemdata is NULL for container callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 311 diff changeset	2504 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	2505 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	2506 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	2507 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	2508 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	2509
5c66a108aa47 Fixed 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 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	2511
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2512 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	2513 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	2514
5c66a108aa47 Fixed 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 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	2516
5c66a108aa47 Fixed 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 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	2518
69 9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	2519 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	2520
58 5c66a108aa47 Fixed 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 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	2522 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2523 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	2524 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	2525
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2526 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	2527 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	2528 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2529
5c66a108aa47 Fixed 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 /* 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	2531 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	2532 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	2533
312 ff8f23594b15 Make sure itemdata is NULL for container callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 311 diff changeset	2534 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	2535 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	2536 }
58 5c66a108aa47 Fixed 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 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	2538 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	2539 }
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	2540 }
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	2541 break;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2542 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2543
5c66a108aa47 Fixed 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 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	2545 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	2546 return CallWindowProc(cinfo->pOldProc, hWnd, msg, mp1, mp2);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2547 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2548
68 8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2549 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	2550 {
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2551 ContainerInfo *cinfo;
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2552
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	2553 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	2554
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2555 switch( msg )
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2556 {
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2557 case WM_CHAR:
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2558 if(LOWORD(mp1) == '\t')
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2559 {
82 aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	2560 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	2561 _shift_focus_back(hWnd);
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2562 else
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2563 _shift_focus(hWnd);
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2564 return FALSE;
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2565 }
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2566 break;
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2567 }
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2568
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2569 if(!cinfo \|\| !cinfo->pOldProc)
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2570 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	2571 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	2572 }
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	2573
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2574 void _changebox(Box *thisbox, int percent, int type)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2575 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2576 int z;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2577
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2578 for(z=0;z<thisbox->count;z++)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2579 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2580 if(thisbox->items[z].type == TYPEBOX)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2581 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	2582 Box tmp = (Box)GetWindowLongPtr(thisbox->items[z].hwnd, GWLP_USERDATA);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2583 _changebox(tmp, percent, type);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2584 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2585 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2586 {
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	2587 if(type == DW_HORZ)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2588 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2589 if(thisbox->items[z].hsize == SIZEEXPAND)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2590 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	2591 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2592 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2593 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2594 if(thisbox->items[z].vsize == SIZEEXPAND)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2595 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	2596 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2597 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2598 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2599 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2600
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2601 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	2602 {
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	2603 if(type == DW_HORZ)
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2604 {
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	2605 int newx = x;
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2606 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	2607 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	2608 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	2609 Box tmp = (Box )GetWindowLongPtr(handle1, GWLP_USERDATA);
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2610
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	2611 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	2612
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2613 ShowWindow(handle1, SW_HIDE);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2614 ShowWindow(handle2, SW_HIDE);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2615
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2616 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	2617 _do_resize(tmp, newx - 1, y - 1);
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2618
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	2619 tmp = (Box *)GetWindowLongPtr(handle2, GWLP_USERDATA);
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2620
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2621 newx = x - newx - SPLITBAR_WIDTH;
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2622
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2623 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	2624 _do_resize(tmp, newx - 1, y - 1);
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2625
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2626 ShowWindow(handle1, SW_SHOW);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2627 ShowWindow(handle2, SW_SHOW);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2628
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2629 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	2630 }
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2631 else
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2632 {
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	2633 int newy = y;
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2634 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	2635 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	2636 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	2637 Box tmp = (Box )GetWindowLongPtr(handle1, GWLP_USERDATA);
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2638
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	2639 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	2640
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2641 ShowWindow(handle1, SW_HIDE);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2642 ShowWindow(handle2, SW_HIDE);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2643
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2644 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	2645 _do_resize(tmp, x - 1, newy - 1);
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2646
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	2647 tmp = (Box *)GetWindowLongPtr(handle2, GWLP_USERDATA);
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2648
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2649 newy = y - newy - SPLITBAR_WIDTH;
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2650
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2651 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	2652 _do_resize(tmp, x - 1, newy - 1);
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2653
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2654 ShowWindow(handle1, SW_SHOW);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2655 ShowWindow(handle2, SW_SHOW);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2656
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2657 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	2658 }
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2659 }
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2660
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2661 /* 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	2662 BOOL CALLBACK _splitwndproc(HWND hwnd, UINT msg, WPARAM mp1, LPARAM mp2)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2663 {
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	2664 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	2665 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	2666 int start = (int)dw_window_get_data(hwnd, "_dw_start");
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2667
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2668 switch (msg)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2669 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2670 case WM_ACTIVATE:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2671 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	2672 return FALSE;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2673
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2674 case WM_PAINT:
118 c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	2675 {
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2676 PAINTSTRUCT ps;
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2677 HDC hdcPaint;
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2678
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2679 BeginPaint(hwnd, &ps);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2680
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2681 if((hdcPaint = GetDC(hwnd)) != NULL)
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2682 {
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2683 int cx, cy;
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2684 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	2685 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	2686
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2687 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	2688
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	2689 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	2690 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	2691 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	2692 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	2693
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2694 SelectObject(hdcPaint, oldBrush);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2695 DeleteObject(SelectObject(hdcPaint, oldPen));
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2696 ReleaseDC(hwnd, hdcPaint);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2697 }
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2698 EndPaint(hwnd, &ps);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	2699 }
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2700 break;
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2701 case WM_LBUTTONDOWN:
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2702 {
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2703 SetCapture(hwnd);
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2704 break;
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2705 }
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2706 case WM_LBUTTONUP:
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2707 {
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2708 if(GetCapture() == hwnd)
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2709 ReleaseCapture();
118 c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	2710 }
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	2711 break;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2712 case WM_MOUSEMOVE:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2713 {
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	2714 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	2715 SetCursor(LoadCursor(NULL, IDC_SIZEWE));
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2716 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	2717 SetCursor(LoadCursor(NULL, IDC_SIZENS));
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2718
127 c5c3ccb84ac7 Safety checks in the splitbar calculations on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 126 diff changeset	2719 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	2720 {
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2721 POINT point;
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2722 RECT rect;
157 a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2723 static POINT lastpoint;
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2724
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2725 GetCursorPos(&point);
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2726 GetWindowRect(hwnd, &rect);
72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2727
157 a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2728 if(memcmp(&point, &lastpoint, sizeof(POINT)))
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2729 {
157 a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2730 if(PtInRect(&rect, point))
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2731 {
157 a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2732 int width = (rect.right - rect.left);
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2733 int height = (rect.bottom - rect.top);
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2734
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	2735 if(type == DW_HORZ)
157 a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2736 {
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2737 start = point.x - rect.left;
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2738 if(width - SPLITBAR_WIDTH > 1 && start < width - SPLITBAR_WIDTH)
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2739 percent = ((float)start / (float)(width - SPLITBAR_WIDTH)) 100.0;
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2740 }
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2741 else
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2742 {
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2743 start = point.y - rect.top;
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2744 if(height - SPLITBAR_WIDTH > 1 && start < height - SPLITBAR_WIDTH)
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2745 percent = ((float)start / (float)(height - SPLITBAR_WIDTH)) 100.0;
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2746 }
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2747 _handle_splitbar_resize(hwnd, *percent, type, width, height);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2748 }
157 a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	2749 memcpy(&lastpoint, &point, sizeof(POINT));
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2750 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2751 }
126 72cb88af4490 Finalized splitbar support on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 124 diff changeset	2752 break;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2753 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2754 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2755 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	2756 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2757
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2758 /* 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	2759 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	2760 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2761 switch (msg)
7 005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	2762 {
58 5c66a108aa47 Fixed 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 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	2764 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2765 /* 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	2766 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	2767
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2768 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	2769 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	2770 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2771 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	2772 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2773 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	2774 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	2775 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	2776 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	2777 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	2778 char tempbuf[1024] = "";
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	2779 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	2780 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	2781 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	2782
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2783 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	2784 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	2785
299 2a97f8d9b297 Use DrawStatusText() to make the status lines, instead of doing it ourself. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 298 diff changeset	2786 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	2787 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	2788 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	2789 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	2790 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	2791 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	2792 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	2793 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	2794 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	2795 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	2796 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	2797 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	2798 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2799 return FALSE;
7 005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	2800 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2801 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	2802 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2803
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2804 /* Function: _BtProc
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2805 * Abstract: Subclass procedure for buttons
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2806 */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2807
58 5c66a108aa47 Fixed 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 BOOL CALLBACK _BtProc(HWND hwnd, ULONG msg, WPARAM mp1, LPARAM mp2)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2809 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2810 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	2811 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	2812 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	2813 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	2814 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	2815
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	2816 bubble = (BubbleButton *)GetWindowLongPtr(hwnd, GWLP_USERDATA);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2817
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2818 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	2819 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	2820
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2821 /* 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	2822 * 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	2823 * 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	2824 * 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	2825 */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2826 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	2827
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2828 switch(msg)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2829 {
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	2830 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	2831 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	2832 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	2833 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	2834 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	2835 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	2836 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	2837 _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	2838 break;
37 360bc6a5f1c9 Sync with latest Dynamic Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 34 diff changeset	2839 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	2840 _wndproc(hwnd, msg, mp1, mp2);
37 360bc6a5f1c9 Sync with latest Dynamic Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 34 diff changeset	2841 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	2842 case WM_LBUTTONUP:
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2843 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2844 SignalHandler *tmp = Root;
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 /* 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	2847 while(tmp)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2848 {
58 5c66a108aa47 Fixed 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 if(tmp->message == WM_COMMAND)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2850 {
58 5c66a108aa47 Fixed 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 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	2852
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2853 /* 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	2854 if(tmp->window == hwnd)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2855 {
60 61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	2856 if(bubble->checkbox)
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	2857 in_checkbox_handler = 1;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	2858
58 5c66a108aa47 Fixed 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 clickfunc(tmp->window, tmp->data);
60 61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	2860
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	2861 if(bubble->checkbox)
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	2862 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	2863 tmp = NULL;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2864 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2865 }
58 5c66a108aa47 Fixed 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 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	2867 tmp= tmp->next;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2868 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2869 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2870 break;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2871 case WM_CHAR:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2872 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2873 /* A button press should also occur for an ENTER or SPACE press
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2874 * while the button has the active input focus.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2875 */
58 5c66a108aa47 Fixed 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 if(LOWORD(mp1) == '\r' \|\| LOWORD(mp1) == ' ')
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2877 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2878 SignalHandler *tmp = Root;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2879
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2880 /* Find any callbacks for this function */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2881 while(tmp)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2882 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2883 if(tmp->message == WM_COMMAND)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2884 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2885 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	2886
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2887 /* Make sure it's the right window, and the right ID */
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2888 if(tmp->window == hwnd)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2889 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2890 clickfunc(tmp->window, tmp->data);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2891 tmp = NULL;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2892 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2893 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2894 if(tmp)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2895 tmp= tmp->next;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2896 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2897 }
58 5c66a108aa47 Fixed 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 if(LOWORD(mp1) == '\t')
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2899 {
82 aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	2900 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	2901 _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	2902 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	2903 _shift_focus(hwnd);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2904 return FALSE;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2905 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2906 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2907 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	2908 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	2909 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	2910 _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	2911 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	2912 _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	2913 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	2914 case WM_TIMER:
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2915 if (hwndBubble)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2916 {
82 aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	2917 _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	2918 DestroyWindow(hwndBubble);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2919 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	2920 KillTimer(hwnd, 1);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2921 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2922 break;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2923
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2924 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	2925 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	2926 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	2927
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2928 if(PtInRect(&rect, point))
17 f26eced21a30 Some more updates. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 15 diff changeset	2929 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2930 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	2931 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2932 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	2933 }
5c66a108aa47 Fixed 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 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	2935 {
5c66a108aa47 Fixed 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 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	2937 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	2938 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	2939
5c66a108aa47 Fixed 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 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	2941 {
82 aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	2942 _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	2943 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	2944 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	2945 KillTimer(hwndBubbleLast, 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	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
5c66a108aa47 Fixed 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(!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	2949 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2950 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	2951 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	2952 SIZE size;
82 aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	2953 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	2954 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	2955 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	2956 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	2957
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2958 /* 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	2959 * 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	2960 * 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	2961 */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2962 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	2963 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	2964 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	2965 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	2966 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	2967 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	2968 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	2969 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	2970 NULL,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	2971 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	2972 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	2973
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2974 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	2975 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	2976
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2977 hwndBubbleLast = 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	2978
5c66a108aa47 Fixed 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 SetTimer(hwnd, 1, 3000, 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	2980
82 aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	2981 hFont = (HFONT)SendMessage(hwndBubble, WM_GETFONT, 0, 0);
aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	2982
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2983 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	2984
82 aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	2985 if(hFont)
aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	2986 oldFont = (HFONT)SelectObject(hdc, hFont);
aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	2987
aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	2988 GetTextExtentPoint32(hdc, bubble->bubbletext, strlen(bubble->bubbletext), &size);
aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	2989
aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	2990 if(hFont)
aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	2991 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	2992
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2993 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	2994
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2995 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	2996
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	2997 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	2998 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	2999 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	3000 ptlWork.y + (rect.bottom-rect.top) + 1,
82 aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	3001 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	3002 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	3003 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	3004
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3005 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	3006 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3007 }
5c66a108aa47 Fixed 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 }
5c66a108aa47 Fixed 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 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	3010 /* 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	3011 * 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	3012 */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3013 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	3014
5c66a108aa47 Fixed 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 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	3016 {
5c66a108aa47 Fixed 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 bMouseOver = 0;
82 aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	3018 _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	3019 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	3020 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	3021 KillTimer(hwndBubbleLast, 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	3022 }
5c66a108aa47 Fixed 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 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	3025 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	3026 /* 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	3027 * 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	3028 * 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	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 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	3031 {
5c66a108aa47 Fixed 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 bMouseOver = 0;
82 aec9a0b0b539 Fixes for a resource leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 79 diff changeset	3033 _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	3034 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	3035 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	3036 KillTimer(hwndBubbleLast, 1);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3037 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3038 break;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3039 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3040
58 5c66a108aa47 Fixed 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 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	3042 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	3043 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	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
5c66a108aa47 Fixed 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 /* 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	3047 * 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	3048 */
5c66a108aa47 Fixed 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 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	3050 {
5c66a108aa47 Fixed 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 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	3052 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	3053
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3054 if(array && array[pageid])
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3055 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	3056 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	3057
5c66a108aa47 Fixed 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 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	3059 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	3060 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	3061 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	3062 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	3063 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3064 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	3065 _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	3066 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	3067 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3068
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3069 ShowWindow(array[pageid]->hwnd, SW_SHOWNORMAL);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3070 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3071 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3072
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3073 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3074 * Initializes the Dynamic Windows engine.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3075 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3076 * newthread: True if this is the only thread.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3077 * False if there is already a message loop running.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3078 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3079 int API dw_init(int newthread, int argc, char *argv[])
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3080 {
58 5c66a108aa47 Fixed 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 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	3082 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	3083 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	3084
5c66a108aa47 Fixed 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 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	3086 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	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 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	3089
5c66a108aa47 Fixed 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 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	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 /* 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	3093 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	3094 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	3095 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	3096 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	3097 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	3098 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	3099 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	3100 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	3101
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3102 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	3103
5c66a108aa47 Fixed 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 /* 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	3105 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	3106 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	3107 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	3108 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	3109 wc.cbWndExtra = 0;
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	3110 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	3111 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	3112 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	3113
5c66a108aa47 Fixed 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 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	3115
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3116 /* 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	3117 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	3118 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	3119 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	3120 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	3121 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	3122 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	3123 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	3124 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	3125 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	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 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	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 /* 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	3130 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	3131 _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	3132
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3133 /* 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	3134 * 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	3135 * 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	3136 */
5c66a108aa47 Fixed 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 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	3138 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	3139 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	3140 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	3141 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	3142 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	3143 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	3144 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	3145 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	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 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	3148
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3149 /* 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	3150 * 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	3151 * 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	3152 * 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	3153 * 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	3154 */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3155
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3156 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	3157 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	3158
5c66a108aa47 Fixed 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 if(!DW_HWND_OBJECT)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3160 {
399 a7a561103eac Add flags parameter to dw_messagebox() to specify buttons and icon displayed. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 389 diff changeset	3161 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	3162 exit(1);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3163 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3164
58 5c66a108aa47 Fixed 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 /* 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	3166 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	3167 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	3168
5c66a108aa47 Fixed 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 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	3170 {
5c66a108aa47 Fixed 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 _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	3172 _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	3173 _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	3174 _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	3175 }
5c66a108aa47 Fixed 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
5c66a108aa47 Fixed 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 return 0;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3178 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3179
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3180 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3181 * 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	3182 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3183 void API dw_main(void)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3184 {
58 5c66a108aa47 Fixed 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 MSG msg;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3186
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	3187 _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	3188
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	3189 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	3190 {
5c66a108aa47 Fixed 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 TranslateMessage(&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	3192 DispatchMessage(&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	3193 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3194 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3195
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3196 /*
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	3197 * 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	3198 * Parameters:
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	3199 * 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	3200 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3201 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	3202 {
58 5c66a108aa47 Fixed 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 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	3204 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	3205
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	3206 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	3207 {
58 5c66a108aa47 Fixed 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 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	3209 {
58 5c66a108aa47 Fixed 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 GetMessage(&msg, NULL, 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	3211 TranslateMessage(&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	3212 DispatchMessage(&msg);
37 360bc6a5f1c9 Sync with latest Dynamic Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 34 diff changeset	3213 }
360bc6a5f1c9 Sync with latest Dynamic Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 34 diff changeset	3214 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	3215 Sleep(1);
37 360bc6a5f1c9 Sync with latest Dynamic Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 34 diff changeset	3216 }
360bc6a5f1c9 Sync with latest Dynamic Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 34 diff changeset	3217 }
360bc6a5f1c9 Sync with latest Dynamic Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 34 diff changeset	3218
360bc6a5f1c9 Sync with latest Dynamic Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 34 diff changeset	3219 /*
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	3220 * 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	3221 */
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	3222 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	3223 {
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	3224 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	3225
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	3226 _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	3227
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	3228 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	3229 {
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	3230 TranslateMessage(&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	3231 DispatchMessage(&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	3232 }
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	3233 }
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	3234
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	3235 /*
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3236 * Free's memory allocated by dynamic windows.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3237 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3238 * ptr: Pointer to dynamic windows allocated
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3239 * memory to be free()'d.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3240 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3241 void API dw_free(void *ptr)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3242 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3243 free(ptr);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3244 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3245
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3246 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3247 * Allocates and initializes a dialog struct.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3248 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3249 * data: User defined data to be passed to functions.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3250 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3251 DWDialog * API dw_dialog_new(void *data)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3252 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3253 DWDialog *tmp = malloc(sizeof(DWDialog));
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3254
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3255 tmp->eve = dw_event_new();
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3256 dw_event_reset(tmp->eve);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3257 tmp->data = data;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3258 tmp->done = FALSE;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3259 tmp->result = NULL;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3260
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3261 return tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3262 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3263
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3264 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3265 * Accepts a dialog struct and returns the given data to the
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3266 * initial called of dw_dialog_wait().
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3267 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3268 * dialog: Pointer to a dialog struct aquired by dw_dialog_new).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3269 * result: Data to be returned by dw_dialog_wait().
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3270 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3271 int API dw_dialog_dismiss(DWDialog dialog, void result)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3272 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3273 dialog->result = result;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3274 dw_event_post(dialog->eve);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3275 dialog->done = TRUE;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3276 return 0;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3277 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3278
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3279 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3280 * Accepts a dialog struct waits for dw_dialog_dismiss() to be
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3281 * called by a signal handler with the given dialog struct.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3282 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3283 * dialog: Pointer to a dialog struct aquired by dw_dialog_new).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3284 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3285 void * API dw_dialog_wait(DWDialog *dialog)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3286 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3287 MSG msg;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3288 void *tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3289
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3290 while (GetMessage(&msg,NULL,0,0))
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3291 {
200 446dd8cea477 Removed window parameter on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 197 diff changeset	3292 if(msg.hwnd == NULL && msg.message == WM_TIMER)
446dd8cea477 Removed window parameter on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 197 diff changeset	3293 _wndproc(msg.hwnd, msg.message, msg.wParam, msg.lParam);
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3294 TranslateMessage(&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	3295 DispatchMessage(&msg);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3296 if(dialog->done)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3297 break;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3298 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3299 dw_event_close(&dialog->eve);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3300 tmp = dialog->result;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3301 free(dialog);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3302 return tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3303 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3304
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3305 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3306 * Displays a Message Box with given text and title..
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3307 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3308 * title: The title of the message box.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3309 * format: printf style format string.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3310 * ...: Additional variables for use in the format.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3311 */
399 a7a561103eac Add flags parameter to dw_messagebox() to specify buttons and icon displayed. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 389 diff changeset	3312 int API dw_messagebox(char title, int flags, char format, ...)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3313 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3314 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	3315 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	3316 int rc;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3317
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3318 va_start(args, format);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3319 vsprintf(outbuf, format, args);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3320 va_end(args);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3321
399 a7a561103eac Add flags parameter to dw_messagebox() to specify buttons and icon displayed. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 389 diff changeset	3322 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	3323 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	3324 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	3325 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	3326 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	3327 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	3328 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	3329 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	3330 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	3331 else return 0;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3332 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3333
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3334 /*
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3335 * 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	3336 * 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	3337 * 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	3338 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3339 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	3340 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3341 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	3342 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3343
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3344 /*
40 88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	3345 * Makes the window topmost.
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	3346 * Parameters:
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	3347 * 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	3348 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3349 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	3350 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3351 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	3352 }
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	3353
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	3354 /*
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	3355 * Makes the window bottommost.
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	3356 * Parameters:
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	3357 * 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	3358 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3359 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	3360 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3361 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	3362 }
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	3363
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	3364 /*
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3365 * Makes the window visible.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3366 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3367 * handle: The window handle to make visible.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3368 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3369 int API dw_window_show(HWND handle)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3370 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3371 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	3372 SetFocus(handle);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3373 _initial_focus(handle);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3374 return rc;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3375 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3376
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3377 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3378 * Makes the window invisible.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3379 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3380 * handle: The window handle to make visible.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3381 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3382 int API dw_window_hide(HWND handle)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3383 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3384 return ShowWindow(handle, SW_HIDE);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3385 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3386
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3387 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3388 * Destroys a window and all of it's children.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3389 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3390 * handle: The window handle to destroy.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3391 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3392 int API dw_window_destroy(HWND handle)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3393 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3394 HWND parent = GetParent(handle);
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	3395 Box thisbox = (Box )GetWindowLongPtr(parent, GWLP_USERDATA);
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	3396
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	3397 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	3398 {
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	3399 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	3400 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	3401
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	3402 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	3403 {
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	3404 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	3405 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	3406 }
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	3407
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	3408 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	3409 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	3410
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	3411 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	3412
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	3413 /* 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	3414 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	3415 {
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	3416 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	3417 }
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	3418 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	3419 {
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	3420 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	3421 }
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	3422
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	3423 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	3424 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	3425 thisbox->count--;
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	3426 _free_window_memory(handle, 0);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	3427 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	3428 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3429 return DestroyWindow(handle);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3430 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3431
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	3432 /* 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	3433 * 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	3434 * 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	3435 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3436 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	3437 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	3438 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	3439
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3440 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	3441 {
58 5c66a108aa47 Fixed 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 RECT rect;
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	3443 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	3444
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3445 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	3446
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	3447 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	3448 _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	3449 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	3450 }
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	3451 }
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	3452
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	3453 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	3454 {
a3a299455c67 Added parsing for " Bold" and " Italic" in the font name so it behaves bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 399 diff changeset	3455 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	3456
a3a299455c67 Added parsing for " Bold" and " Italic" in the font name so it behaves bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 399 diff changeset	3457 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	3458 {
414 2a55f61714fd Off by 1 test in _acquire_font(). "10.Terminal Bold" now works. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 411 diff changeset	3459 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	3460 {
a3a299455c67 Added parsing for " Bold" and " Italic" in the font name so it behaves bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 399 diff changeset	3461 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	3462 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	3463 }
a3a299455c67 Added parsing for " Bold" and " Italic" in the font name so it behaves bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 399 diff changeset	3464 }
a3a299455c67 Added parsing for " Bold" and " Italic" in the font name so it behaves bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 399 diff changeset	3465 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	3466 }
a3a299455c67 Added parsing for " Bold" and " Italic" in the font name so it behaves bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 399 diff changeset	3467
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3468 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3469 * Changes a window's parent to newparent.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3470 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3471 * handle: The window handle to destroy.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3472 * newparent: The window's new parent window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3473 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3474 void API dw_window_reparent(HWND handle, HWND newparent)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3475 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3476 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	3477 }
5c66a108aa47 Fixed 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
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	3479 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	3480 {
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	3481 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	3482
cf00d6e2b3cc Optimizations to the layout engine on OS/2 and Windows, eliminated 3 MUL bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 451 diff changeset	3483 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	3484 {
439 7f39be80dec3 Hopefully better method of removing the font modifiers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 438 diff changeset	3485 int Italic, Bold;
7f39be80dec3 Hopefully better method of removing the font modifiers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 438 diff changeset	3486 char *myFontName;
7f39be80dec3 Hopefully better method of removing the font modifiers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 438 diff changeset	3487 int z, size = 9;
7f39be80dec3 Hopefully better method of removing the font modifiers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 438 diff changeset	3488 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	3489 #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	3490 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	3491 #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	3492 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	3493 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3494 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	3495 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	3496 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3497 size = atoi(fontname) + 5;
439 7f39be80dec3 Hopefully better method of removing the font modifiers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 438 diff changeset	3498 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	3499 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	3500 #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	3501 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	3502 #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	3503 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	3504 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	3505 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	3506 lf.lfOrientation = 0;
439 7f39be80dec3 Hopefully better method of removing the font modifiers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 438 diff changeset	3507 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	3508 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	3509 lf.lfStrikeOut = 0;
439 7f39be80dec3 Hopefully better method of removing the font modifiers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 438 diff changeset	3510 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	3511 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	3512 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	3513 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	3514 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	3515 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	3516 /*
439 7f39be80dec3 Hopefully better method of removing the font modifiers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 438 diff changeset	3517 * 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	3518 */
98d6c00fe11e Fix bug with specifying fonts with modifiers; the modifiers were not being mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 429 diff changeset	3519 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	3520 if(Italic)
7f39be80dec3 Hopefully better method of removing the font modifiers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 438 diff changeset	3521 myFontName[Italic] = 0;
7f39be80dec3 Hopefully better method of removing the font modifiers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 438 diff changeset	3522 if(Bold)
7f39be80dec3 Hopefully better method of removing the font modifiers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 438 diff changeset	3523 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	3524 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	3525 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	3526
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3527 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	3528 #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	3529 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	3530 #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	3531 }
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	3532 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	3533 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	3534 return hfont;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3535 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3536
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3537 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3538 * Sets the font used by a specified window (widget) handle.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3539 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3540 * handle: The window (widget) handle.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3541 * fontname: Name and size of the font in the form "size.fontname"
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3542 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3543 int API dw_window_set_font(HWND handle, char *fontname)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3544 {
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	3545 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	3546 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	3547 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	3548
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	3549 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	3550
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3551 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	3552 {
5c66a108aa47 Fixed 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 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	3554 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3555 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	3556 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	3557 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	3558 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	3559 }
5c66a108aa47 Fixed 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 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	3561 {
5c66a108aa47 Fixed 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 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	3563 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	3564
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3565 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	3566
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3567 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	3568 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	3569 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3570 }
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	3571 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	3572 if(oldfont)
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	3573 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	3574 return 0;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3575 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3576
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3577 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3578 * Sets the colors used by a specified window (widget) handle.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3579 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3580 * 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	3581 * 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	3582 * back: Background color in RGB format.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3583 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3584 int API dw_window_set_color(HWND handle, ULONG fore, ULONG back)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3585 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3586 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	3587 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	3588
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	3589 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	3590
5c66a108aa47 Fixed 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 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	3592
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3593 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	3594 {
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	3595 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	3596 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	3597
58 5c66a108aa47 Fixed 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 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	3599 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	3600 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	3601 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	3602 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	3603 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	3604 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	3605 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	3606 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	3607 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	3608 return TRUE;
7 005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	3609 }
58 5c66a108aa47 Fixed 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 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	3612 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3613 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	3614 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	3615 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3616 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	3617 {
5c66a108aa47 Fixed 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 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	3619
5c66a108aa47 Fixed 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 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	3621 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	3622
5c66a108aa47 Fixed 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 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	3624 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	3625 }
5c66a108aa47 Fixed 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 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	3627 return TRUE;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3628 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3629
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3630 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3631 * Sets the font used by a specified window (widget) handle.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3632 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3633 * handle: The window (widget) handle.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3634 * border: Size of the window border in pixels.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3635 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3636 int API dw_window_set_border(HWND handle, int border)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3637 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3638 return 0;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3639 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3640
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3641 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3642 * Captures the mouse input to this window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3643 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3644 * handle: Handle to receive mouse input.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3645 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3646 void API dw_window_capture(HWND handle)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3647 {
58 5c66a108aa47 Fixed 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 SetCapture(handle);
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 * Releases previous mouse capture.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3653 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3654 void API dw_window_release(void)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3655 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3656 ReleaseCapture();
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3657 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3658
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3659 /*
22 6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	3660 * 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	3661 * Parameters:
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	3662 * 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	3663 * 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	3664 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3665 void API dw_window_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	3666 {
399 a7a561103eac Add flags parameter to dw_messagebox() to specify buttons and icon displayed. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 389 diff changeset	3667 /*
a7a561103eac Add flags parameter to dw_messagebox() to specify buttons and icon displayed. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 389 diff changeset	3668 if(pointertype == DW_POINTER_ARROW)
a7a561103eac Add flags parameter to dw_messagebox() to specify buttons and icon displayed. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 389 diff changeset	3669 SetClassLong( handle, GCL_HCURSOR, LoadCursor( NULL, IDC_ARROW));
a7a561103eac Add flags parameter to dw_messagebox() to specify buttons and icon displayed. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 389 diff changeset	3670 else if(pointertype == DW_POINTER_CLOCK)
a7a561103eac Add flags parameter to dw_messagebox() to specify buttons and icon displayed. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 389 diff changeset	3671 SetClassLong( handle, GCL_HCURSOR, LoadCursor( NULL, IDC_WAIT));
a7a561103eac Add flags parameter to dw_messagebox() to specify buttons and icon displayed. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 389 diff changeset	3672 else
a7a561103eac Add flags parameter to dw_messagebox() to specify buttons and icon displayed. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 389 diff changeset	3673 */
339 4482dd0bb87d Minor fix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 337 diff changeset	3674 SetCursor(pointertype < 65536 ? LoadCursor(NULL, MAKEINTRESOURCE(pointertype)) : (HCURSOR)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	3675 }
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	3676
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	3677 /*
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3678 * Create a new Window Frame.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3679 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3680 * owner: The Owner's window handle or HWND_DESKTOP.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3681 * 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	3682 * flStyle: Style flags, see the DW reference.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3683 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3684 HWND API dw_window_new(HWND hwndOwner, char *title, ULONG flStyle)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3685 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3686 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	3687 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	3688 ULONG flStyleEx = 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 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	3691 newbox->type = DW_VERT;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3692 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	3693 newbox->cinfo.fore = newbox->cinfo.back = -1;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3694
58 5c66a108aa47 Fixed 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 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	3696 flStyleEx \|= WS_EX_MDICHILD;
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3697
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3698 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	3699 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	3700
5c66a108aa47 Fixed 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 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	3702 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3703 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	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 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	3706 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	3707 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3708 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	3709 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3710 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	3711
5c66a108aa47 Fixed 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 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	3713 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	3714 }
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	3715 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	3716
5c66a108aa47 Fixed 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 #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	3718 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	3719 SetParent(hwndframe, 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	3720 #endif
12 26e2130135b9 Many Win32 and GTK fixes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 7 diff changeset	3721
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3722 return hwndframe;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3723 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3724
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3725 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3726 * Create a new Box to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3727 * 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	3728 * type: Either DW_VERT (vertical) or DW_HORZ (horizontal).
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3729 * pad: Number of pixels to pad around the box.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3730 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3731 HWND API dw_box_new(int type, int pad)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3732 {
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	3733 Box *newbox = calloc(sizeof(Box), 1);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3734 HWND hwndframe;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3735
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3736 newbox->pad = pad;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3737 newbox->type = type;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3738 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	3739 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	3740 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	3741
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3742 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	3743 "",
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	3744 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	3745 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	3746 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	3747 NULL,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	3748 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	3749 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	3750
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3751 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	3752 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	3753
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	3754 SetWindowLongPtr(hwndframe, GWLP_USERDATA, (LONG_PTR)newbox);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3755 return hwndframe;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3756 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3757
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3758 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3759 * Create a new Group Box to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3760 * 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	3761 * type: Either DW_VERT (vertical) or DW_HORZ (horizontal).
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3762 * pad: Number of pixels to pad around the box.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3763 * title: Text to be displayined in the group outline.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3764 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3765 HWND API dw_groupbox_new(int type, int pad, char *title)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3766 {
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	3767 Box *newbox = calloc(sizeof(Box), 1);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3768 HWND hwndframe;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3769
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3770 newbox->pad = pad;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3771 newbox->type = type;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3772 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	3773 newbox->cinfo.fore = newbox->cinfo.back = -1;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3774
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3775 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	3776 "",
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	3777 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	3778 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	3779 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	3780 NULL,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	3781 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	3782 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	3783
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3784 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	3785 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	3786 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	3787 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	3788 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	3789 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	3790 NULL,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	3791 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	3792 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	3793
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	3794 SetWindowLongPtr(hwndframe, GWLP_USERDATA, (LONG_PTR)newbox);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3795 dw_window_set_font(newbox->grouphwnd, DefaultFont);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3796 return hwndframe;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3797 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3798
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3799 /*
14 176cee043f1b Lots of Windows and Unix bug fixes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 12 diff changeset	3800 * 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	3801 * Parameters:
176cee043f1b Lots of Windows and Unix bug fixes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 12 diff changeset	3802 * 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	3803 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3804 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	3805 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3806 CLIENTCREATESTRUCT ccs;
14 176cee043f1b Lots of Windows and Unix bug fixes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 12 diff changeset	3807 HWND hwndframe;
176cee043f1b Lots of Windows and Unix bug fixes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 12 diff changeset	3808
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3809 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	3810 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	3811
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3812 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	3813 "",
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	3814 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	3815 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	3816 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	3817 (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	3818 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	3819 &ccs);
14 176cee043f1b Lots of Windows and Unix bug fixes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 12 diff changeset	3820 return hwndframe;
176cee043f1b Lots of Windows and Unix bug fixes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 12 diff changeset	3821 }
176cee043f1b Lots of Windows and Unix bug fixes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 12 diff changeset	3822
176cee043f1b Lots of Windows and Unix bug fixes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 12 diff changeset	3823 /*
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3824 * Create a bitmap object to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3825 * 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	3826 * 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	3827 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3828 HWND API dw_bitmap_new(ULONG id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3829 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3830 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	3831 "",
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	3832 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	3833 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	3834 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	3835 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	3836 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	3837 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	3838 NULL);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3839 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3840
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3841 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3842 * Create a notebook object to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3843 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3844 * id: An ID to be used for getting the resource from the
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3845 * resource file.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3846 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3847 HWND API dw_notebook_new(ULONG id, int top)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3848 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3849 ULONG flags = 0;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3850 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	3851 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	3852
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3853 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	3854 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	3855
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3856 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	3857 "",
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	3858 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	3859 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	3860 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	3861 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	3862 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	3863 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	3864 dw_window_set_data(tmp, "_dw_array", (void *)array);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3865 dw_window_set_font(tmp, DefaultFont);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3866 return tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3867 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3868
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3869 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3870 * Create a menu object to be popped up.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3871 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3872 * id: An ID to be used for getting the resource from the
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3873 * resource file.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3874 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3875 HMENUI API dw_menu_new(ULONG id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3876 {
238 13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	3877 return (HMENUI)CreatePopupMenu();
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3878 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3879
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3880 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3881 * Create a menubar on a window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3882 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3883 * location: Handle of a window frame to be attached to.
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 HMENUI API dw_menubar_new(HWND location)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3886 {
185 f55677513954 Updated the menu code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 182 diff changeset	3887 HMENUI tmp;
f55677513954 Updated the menu code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 182 diff changeset	3888
238 13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	3889 tmp = (HMENUI)CreateMenu();
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	3890
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	3891 #ifndef WINNT_COMPAT
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	3892 {
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	3893 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	3894
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	3895 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	3896 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	3897 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	3898
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	3899 SetMenuInfo((HMENU)tmp, &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	3900 }
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	3901 #endif
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	3902
238 13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	3903 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	3904
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	3905 SetMenu(location, (HMENU)tmp);
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	3906 return location;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3907 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3908
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3909 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3910 * Destroys a menu created with dw_menubar_new or dw_menu_new.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3911 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3912 * menu: Handle of a menu.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3913 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3914 void API dw_menu_destroy(HMENUI *menu)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3915 {
185 f55677513954 Updated the menu code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 182 diff changeset	3916 if(menu)
238 13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	3917 {
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	3918 HMENU mymenu = (HMENU)*menu;
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	3919
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	3920 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	3921 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	3922 if(IsMenu(mymenu))
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	3923 DestroyMenu(mymenu);
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	3924 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3925 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3926
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3927 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3928 * Adds a menuitem or submenu to an existing menu.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3929 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3930 * menu: The handle the the existing menu.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3931 * title: The title text on the menu item to be added.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3932 * id: An ID to be used for message passing.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3933 * end: If TRUE memu is positioned at the end of the menu.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3934 * 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	3935 * flags: Extended attributes to set on the menu.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3936 * submenu: Handle to an existing menu to be a submenu or NULL.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3937 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	3938 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	3939 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3940 MENUITEMINFO mii;
238 13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	3941 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	3942 #ifndef WINNT_COMPAT
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	3943 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	3944 #endif
238 13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	3945
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	3946 if(IsWindow(menux) && !IsMenu(mymenu))
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	3947 mymenu = (HMENU)dw_window_get_data(menux, "_dw_menu");
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3948
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3949 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	3950 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	3951
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3952 /* 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	3953 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	3954 {
5c66a108aa47 Fixed 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 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	3956
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3957 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	3958 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3959 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	3960 *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	3961 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	3962 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3963 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3964
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3965 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	3966 mii.fType = MFT_STRING;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3967 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	3968 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	3969
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	3970 mii.wID = id;
238 13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	3971 if(IsMenu((HMENU)submenu))
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	3972 mii.hSubMenu = (HMENU)submenu;
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	3973 else
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	3974 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	3975 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	3976 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	3977
238 13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	3978 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	3979
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	3980 #ifndef WINNT_COMPAT
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	3981 sprintf(buffer, "_dw_id%d", id);
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	3982 dw_window_set_data(DW_HWND_OBJECT, buffer, (void *)mymenu);
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	3983
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	3984 /* According to the docs this will only work on Win2k/98 and above */
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	3985 if(submenu)
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	3986 {
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	3987 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	3988
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	3989 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	3990 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	3991 mi.dwMenuData = (ULONG_PTR)mymenu;
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	3992
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	3993 SetMenuInfo((HMENU)submenu, &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	3994 }
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	3995 #endif
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	3996
238 13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	3997 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	3998 DrawMenuBar(menux);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3999 return (HWND)id;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4000 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4001
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4002 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4003 * Sets the state of a menu item check.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4004 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4005 * menu: The handle the the existing menu.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4006 * id: Menuitem id.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4007 * check: TRUE for checked FALSE for not checked.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4008 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4009 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	4010 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4011 MENUITEMINFO mii;
238 13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4012 HMENU mymenu = (HMENU)menux;
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4013
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4014 if(IsWindow(menux) && !IsMenu(mymenu))
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4015 mymenu = (HMENU)dw_window_get_data(menux, "_dw_menu");
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4016
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4017 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	4018 mii.fMask = MIIM_STATE;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4019 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	4020 mii.fState = MFS_CHECKED;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4021 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	4022 mii.fState = MFS_UNCHECKED;
238 13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4023 SetMenuItemInfo(mymenu, id, FALSE, &mii);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4024 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4025
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4026 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4027 * Pops up a context menu at given x and y coordinates.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4028 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4029 * menu: The handle the the existing menu.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4030 * parent: Handle to the window initiating the popup.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4031 * x: X coordinate.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4032 * y: Y coordinate.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4033 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4034 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	4035 {
185 f55677513954 Updated the menu code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 182 diff changeset	4036 if(menu)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4037 {
238 13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4038 HMENU mymenu = (HMENU)*menu;
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4039
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4040 if(IsWindow(*menu) && !IsMenu(mymenu))
13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4041 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	4042
93 98cce029a611 Changed handling of menu item click events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 90 diff changeset	4043 popup = parent;
238 13d3de3f1e83 Rewrote the menu code to not return structs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 211 diff changeset	4044 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	4045 PostMessage(DW_HWND_OBJECT, WM_USER+5, (LPARAM)mymenu, 0);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4046 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4047 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4048
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4049
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4050 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4051 * Create a container object to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4052 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4053 * id: An ID to be used for getting the resource from the
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4054 * resource file.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4055 */
350 2216e65ad2ae Removed slider flags and container selection flags from the header file. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 346 diff changeset	4056 HWND API dw_container_new(ULONG id, int multi)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4057 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4058 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	4059 "",
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	4060 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	4061 (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	4062 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	4063 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	4064 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	4065 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	4066 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	4067 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	4068 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	4069 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	4070 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	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 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	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 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	4075 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	4076 }
5c66a108aa47 Fixed 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
5c66a108aa47 Fixed 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 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	4079 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	4080
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	4081 SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)cinfo);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4082 dw_window_set_font(tmp, DefaultFont);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4083 return tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4084 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4085
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4086 /*
22 6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	4087 * 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	4088 * Parameters:
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	4089 * 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	4090 * 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	4091 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4092 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	4093 {
58 5c66a108aa47 Fixed 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 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	4095 "",
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	4096 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	4097 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	4098 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	4099 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	4100 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	4101 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	4102 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	4103 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	4104 NULL);
68 8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4105 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	4106 TreeView_SetItemHeight(tmp, 16);
68 8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4107
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4108 if(!cinfo)
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4109 {
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4110 DestroyWindow(tmp);
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4111 return NULL;
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4112 }
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4113
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4114 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	4115 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	4116
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	4117 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	4118 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	4119 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	4120 }
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	4121
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	4122 /*
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4123 * 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	4124 * 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	4125 * 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	4126 * 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	4127 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4128 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	4129 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4130 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	4131
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4132 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	4133 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	4134 {
5c66a108aa47 Fixed 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 *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	4136 *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	4137 }
5c66a108aa47 Fixed 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 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4139
5c66a108aa47 Fixed 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 /*
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4141 * 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	4142 * 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	4143 * 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	4144 * 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	4145 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4146 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	4147 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4148 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	4149 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4150
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4151 /*
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4152 * Create a new static text window (widget) to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4153 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4154 * 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	4155 * 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	4156 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4157 HWND API dw_text_new(char *text, ULONG id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4158 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4159 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	4160 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	4161 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	4162 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	4163 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	4164 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	4165 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	4166 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	4167 NULL);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4168 dw_window_set_font(tmp, DefaultFont);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4169 return tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4170 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4171
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4172 /*
7 005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	4173 * 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	4174 * Parameters:
005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	4175 * 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	4176 * 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	4177 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4178 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	4179 {
299 2a97f8d9b297 Use DrawStatusText() to make the status lines, instead of doing it ourself. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 298 diff changeset	4180 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	4181 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	4182 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	4183 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	4184 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	4185 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	4186 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	4187 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	4188 NULL);
7 005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	4189 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	4190 SubclassWindow(tmp, _statuswndproc);
7 005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	4191 return tmp;
005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	4192 }
005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	4193
005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	4194 /*
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4195 * Create a new Multiline Editbox window (widget) to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4196 * 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	4197 * 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	4198 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4199 HWND API dw_mle_new(ULONG id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4200 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4201
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4202 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	4203 EDITCLASSNAME,
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4204 "",
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	4205 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	4206 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	4207 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	4208 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	4209 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	4210 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	4211 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	4212 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	4213 NULL);
68 8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4214 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	4215
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4216 if(!cinfo)
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4217 {
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4218 DestroyWindow(tmp);
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4219 return NULL;
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4220 }
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4221
8d6100960adf Minor tab changes on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 67 diff changeset	4222 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	4223 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	4224
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	4225 SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)cinfo);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4226 dw_window_set_font(tmp, DefaultFont);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4227 return tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4228 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4229
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4230 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4231 * Create a new Entryfield window (widget) to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4232 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4233 * 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	4234 * 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	4235 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4236 HWND API dw_entryfield_new(char *text, ULONG id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4237 {
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4238 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	4239 EDITCLASSNAME,
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4240 text,
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4241 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	4242 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	4243 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	4244 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	4245 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	4246 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	4247 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	4248 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	4249 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	4250
5c66a108aa47 Fixed 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 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	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 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	4254 SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)cinfo);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4255 dw_window_set_font(tmp, DefaultFont);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4256 return tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4257 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4258
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4259 /*
58 5c66a108aa47 Fixed 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 * Create a new Entryfield passwird window (widget) to be packed.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4261 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4262 * 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	4263 * 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	4264 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4265 HWND API dw_entryfield_password_new(char *text, ULONG id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4266 {
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4267 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	4268 EDITCLASSNAME,
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4269 text,
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4270 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	4271 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	4272 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	4273 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	4274 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	4275 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	4276 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	4277 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	4278 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	4279
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4280 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	4281
5c66a108aa47 Fixed 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 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	4283 SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)cinfo);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4284 dw_window_set_font(tmp, DefaultFont);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4285 return tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4286 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4287
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4288 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	4289 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4290 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	4291
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4292 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	4293 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4294 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	4295 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	4296 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	4297 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4298 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	4299 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4300
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4301 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4302 * Create a new Combobox window (widget) to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4303 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4304 * 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	4305 * 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	4306 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4307 HWND API dw_combobox_new(char *text, ULONG id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4308 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4309 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	4310 text,
ec311fe773da Include a vertical scrollbar on comboboxes when there are too many items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 88 diff changeset	4311 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	4312 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	4313 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	4314 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	4315 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	4316 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	4317 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	4318 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	4319 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	4320
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	4321 if(!cinfo \|\| !cinfo2)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4322 {
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	4323 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	4324 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	4325 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	4326 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	4327 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	4328 return NULL;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4329 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4330
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4331 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	4332 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	4333 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	4334 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	4335
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	4336 SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)cinfo);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4337 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	4338 SetWindowText(tmp, text);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4339 return tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4340 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4341
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4342 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4343 * Create a new button window (widget) to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4344 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4345 * 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	4346 * 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	4347 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4348 HWND API dw_button_new(char *text, ULONG id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4349 {
60 61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	4350 BubbleButton *bubble = calloc(1, sizeof(BubbleButton));
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4351
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4352 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	4353 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	4354 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	4355 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	4356 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	4357 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	4358 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	4359 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	4360 NULL);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4361
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4362 bubble->id = id;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4363 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	4364 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	4365
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	4366 SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)bubble);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4367 dw_window_set_font(tmp, DefaultFont);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4368 return tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4369 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4370
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4371 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4372 * Create a new bitmap button window (widget) to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4373 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4374 * text: Bubble help text to be displayed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4375 * id: An ID of a bitmap in the resource file.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4376 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4377 HWND API dw_bitmapbutton_new(char *text, ULONG id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4378 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4379 HWND tmp;
60 61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	4380 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	4381 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	4382
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4383 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	4384 "",
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4385 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	4386 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	4387 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	4388 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	4389 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	4390 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	4391 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	4392 NULL);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4393
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4394 bubble->id = id;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4395 strncpy(bubble->bubbletext, text, BUBBLE_HELP_MAX - 1);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4396 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	4397 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	4398
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	4399 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	4400
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4401 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	4402 (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	4403 (LPARAM) hbitmap);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4404 return tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4405 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4406
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4407 /*
281 2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4408 * 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	4409 * Parameters:
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4410 * 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	4411 * 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	4412 * 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	4413 * 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	4414 * (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	4415 */
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4416 HWND dw_bitmapbutton_new_from_file(char text, unsigned long id, char filename)
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4417 {
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4418 HWND tmp;
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4419 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	4420 HBITMAP hbitmap = 0;
281 2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4421 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	4422
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4423 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	4424 {
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4425 if(file)
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4426 free(file);
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4427 return 0;
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4428 }
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4429
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4430 tmp = CreateWindow(BUTTONCLASSNAME,
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4431 "",
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4432 WS_CHILD \| BS_PUSHBUTTON \|
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4433 BS_BITMAP \| WS_CLIPCHILDREN \|
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4434 WS_VISIBLE,
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4435 0,0,2000,1000,
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4436 DW_HWND_OBJECT,
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4437 (HMENU)id,
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4438 DWInstance,
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4439 NULL);
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4440
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4441 bubble->id = id;
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4442 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	4443 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	4444 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	4445
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	4446 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	4447
303 464b5e46b313 Create the bitmap button even if the bitmap file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 301 diff changeset	4448 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	4449
464b5e46b313 Create the bitmap button even if the bitmap file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 301 diff changeset	4450 /* 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	4451 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	4452 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	4453 else
464b5e46b313 Create the bitmap button even if the bitmap file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 301 diff changeset	4454 {
464b5e46b313 Create the bitmap button even if the bitmap file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 301 diff changeset	4455 /* 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	4456 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	4457 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	4458 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	4459 }
464b5e46b313 Create the bitmap button even if the bitmap file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 301 diff changeset	4460
464b5e46b313 Create the bitmap button even if the bitmap file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 301 diff changeset	4461
464b5e46b313 Create the bitmap button even if the bitmap file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 301 diff changeset	4462 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	4463 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	4464 (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	4465 (LPARAM) hbitmap);
281 2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4466 free(file);
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4467 return tmp;
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4468 }
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4469
2f038ef90a36 Implemented dw_bitmapbutton_new_from_file() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 278 diff changeset	4470 /*
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4471 * Create a new spinbutton window (widget) to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4472 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4473 * 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	4474 * 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	4475 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4476 HWND API dw_spinbutton_new(char *text, ULONG id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4477 {
58 5c66a108aa47 Fixed 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 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	4479 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	4480 EDITCLASSNAME,
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4481 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	4482 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	4483 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	4484 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	4485 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	4486 NULL,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	4487 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	4488 NULL);
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4489 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	4490 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	4491 NULL,
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4492 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	4493 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	4494 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	4495 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	4496 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	4497 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	4498 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	4499 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	4500 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	4501
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4502 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	4503 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	4504 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	4505
5c66a108aa47 Fixed 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 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	4507 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	4508
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4509 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	4510 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	4511 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	4512
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	4513 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	4514 dw_window_set_font(buddy, DefaultFont);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4515 return tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4516 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4517
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4518 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4519 * Create a new radiobutton window (widget) to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4520 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4521 * 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	4522 * 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	4523 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4524 HWND API dw_radiobutton_new(char *text, ULONG id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4525 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4526 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	4527 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	4528 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	4529 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	4530 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	4531 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	4532 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	4533 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	4534 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	4535 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	4536 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	4537 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	4538 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	4539 bubble->cinfo.back = -1;
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	4540 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	4541 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	4542 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	4543 }
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4544
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4545
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4546 /*
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4547 * 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	4548 * Parameters:
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4549 * 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	4550 * 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	4551 * 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	4552 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4553 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	4554 {
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	4555 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	4556 "",
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	4557 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	4558 (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	4559 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	4560 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	4561 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	4562 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	4563 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	4564 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	4565
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4566 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	4567
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4568 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	4569 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	4570 SendMessage(tmp, TBM_SETRANGE, (WPARAM)FALSE, (LPARAM)MAKELONG(0, increments-1));
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4571 return tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4572 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4573
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4574 /*
197 f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	4575 * 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	4576 * Parameters:
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	4577 * 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	4578 * 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	4579 * 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	4580 */
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	4581 HWND API dw_scrollbar_new(int vertical, int increments, ULONG id)
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	4582 {
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	4583 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	4584 "",
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	4585 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	4586 (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	4587 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	4588 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	4589 (HMENU)id,
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	4590 DWInstance,
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	4591 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	4592 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	4593
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	4594 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	4595
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	4596 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	4597 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	4598 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	4599 return tmp;
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	4600 }
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	4601
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	4602 /*
33 72675de7d229 Renamed slider class to percent class. Implemented my own percent widget bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 32 diff changeset	4603 * Create a new percent bar window (widget) to be packed.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4604 * 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	4605 * 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	4606 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4607 HWND API dw_percent_new(ULONG id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4608 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4609 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	4610 "",
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	4611 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	4612 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	4613 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	4614 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	4615 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	4616 NULL);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4617 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4618
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4619 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4620 * Create a new checkbox window (widget) to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4621 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4622 * 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	4623 * 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	4624 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4625 HWND API dw_checkbox_new(char *text, ULONG id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4626 {
60 61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	4627 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	4628 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	4629 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	4630 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	4631 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	4632 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	4633 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	4634 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	4635 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	4636 NULL);
60 61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	4637 bubble->id = id;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	4638 bubble->checkbox = 1;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	4639 bubble->pOldProc = (WNDPROC)SubclassWindow(tmp, _BtProc);
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	4640 bubble->cinfo.fore = -1;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	4641 bubble->cinfo.back = -1;
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	4642 SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)bubble);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4643 dw_window_set_font(tmp, DefaultFont);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4644 return tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4645 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4646
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4647 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4648 * Create a new listbox window (widget) to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4649 * 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	4650 * 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	4651 * multi: Multiple select TRUE or FALSE.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4652 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4653 HWND API dw_listbox_new(ULONG id, int multi)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4654 {
155 840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	4655 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	4656 LISTBOXCLASSNAME,
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	4657 "",
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	4658 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	4659 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	4660 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	4661 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	4662 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	4663 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	4664 (HMENU)id,
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	4665 DWInstance,
840c54766306 Another sync of sources, enhancements to dw_window_set_color() ... works bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 153 diff changeset	4666 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	4667 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	4668
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4669 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	4670 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4671 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	4672 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	4673 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4674
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4675 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	4676 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	4677 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	4678
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	4679 SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)cinfo);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4680 dw_window_set_font(tmp, DefaultFont);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4681 return tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4682 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4683
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4684 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4685 * Sets the icon used for a given window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4686 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4687 * handle: Handle to the window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4688 * id: An ID to be used to specify the icon.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4689 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4690 void API dw_window_set_icon(HWND handle, ULONG id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4691 {
336 a2f72b5d5d0a Minor change to dw_window_set_icon() on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 334 diff changeset	4692 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	4693
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4694 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	4695 (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	4696 (LPARAM) hicon);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4697 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4698
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4699 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4700 * Sets the bitmap used for a given static window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4701 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4702 * 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	4703 * 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	4704 * (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	4705 * 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	4706 * 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	4707 * 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	4708 */
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4709 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	4710 {
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4711 HBITMAP hbitmap;
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	4712 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	4713
278 df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4714 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	4715 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	4716 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	4717 {
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4718 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	4719
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4720 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	4721 return;
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4722
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4723 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	4724
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4725 /* 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	4726 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	4727 {
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4728 /* 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	4729 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	4730 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	4731 {
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4732 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	4733 return;
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4734 }
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4735 }
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4736
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4737 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	4738 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	4739 }
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4740 else
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4741 return;
df0665ba147f Initial code for dw_bitmapbutton_new_from_file and added filename parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 277 diff changeset	4742
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4743 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	4744 (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	4745 (LPARAM) hbitmap);
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	4746
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	4747 if(oldbitmap)
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	4748 DeleteObject(oldbitmap);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4749 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4750
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4751 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4752 * Sets the text used for a given window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4753 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4754 * handle: Handle to the window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4755 * text: The text associsated with a given window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4756 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4757 void API dw_window_set_text(HWND handle, char *text)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4758 {
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	4759 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	4760
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	4761 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	4762
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4763 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	4764
c629838d9805 Updated to latest DW, and updated the Makefile to install the header files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 73 diff changeset	4765 /* 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	4766 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	4767 SendMessage(handle, CB_SETEDITSEL, 0, MAKELPARAM(-1, 0));
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4768 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4769
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4770 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4771 * Gets the text used for a given window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4772 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4773 * handle: Handle to the window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4774 * Returns:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4775 * text: The text associsated with a given window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4776 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4777 char * API dw_window_get_text(HWND handle)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4778 {
173 c2b5d0019ec3 Updated dw_window_get_text() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 168 diff changeset	4779 int len = GetWindowTextLength(handle);
c2b5d0019ec3 Updated dw_window_get_text() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 168 diff changeset	4780 char *tempbuf = calloc(1, len + 2);
c2b5d0019ec3 Updated dw_window_get_text() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 168 diff changeset	4781
c2b5d0019ec3 Updated dw_window_get_text() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 168 diff changeset	4782 GetWindowText(handle, tempbuf, len + 1);
c2b5d0019ec3 Updated dw_window_get_text() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 168 diff changeset	4783
c2b5d0019ec3 Updated dw_window_get_text() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 168 diff changeset	4784 return tempbuf;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4785 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4786
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4787 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4788 * Disables given window (widget).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4789 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4790 * handle: Handle to the window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4791 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4792 void API dw_window_disable(HWND handle)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4793 {
58 5c66a108aa47 Fixed 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 EnableWindow(handle, FALSE);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4795 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4796
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4797 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4798 * Enables given window (widget).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4799 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4800 * handle: Handle to the window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4801 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4802 void API dw_window_enable(HWND handle)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4803 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4804 EnableWindow(handle, TRUE);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4805 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4806
247 c097ffe6cfeb Implemented dw_window_from_id() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 243 diff changeset	4807 static HWND _dw_wfid_hwnd = NULL;
c097ffe6cfeb Implemented dw_window_from_id() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 243 diff changeset	4808
c097ffe6cfeb Implemented dw_window_from_id() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 243 diff changeset	4809 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	4810 {
c097ffe6cfeb Implemented dw_window_from_id() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 243 diff changeset	4811 if(GetWindowLong(handle, GWL_ID) == lParam)
c097ffe6cfeb Implemented dw_window_from_id() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 243 diff changeset	4812 {
c097ffe6cfeb Implemented dw_window_from_id() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 243 diff changeset	4813 _dw_wfid_hwnd = handle;
c097ffe6cfeb Implemented dw_window_from_id() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 243 diff changeset	4814 return FALSE;
c097ffe6cfeb Implemented dw_window_from_id() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 243 diff changeset	4815 }
c097ffe6cfeb Implemented dw_window_from_id() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 243 diff changeset	4816 return TRUE;
c097ffe6cfeb Implemented dw_window_from_id() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 243 diff changeset	4817 }
c097ffe6cfeb Implemented dw_window_from_id() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 243 diff changeset	4818
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4819 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4820 * Gets the child window handle with specified ID.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4821 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4822 * handle: Handle to the parent window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4823 * id: Integer ID of the child.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4824 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4825 HWND API dw_window_from_id(HWND handle, int id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4826 {
247 c097ffe6cfeb Implemented dw_window_from_id() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 243 diff changeset	4827 _dw_wfid_hwnd = NULL;
c097ffe6cfeb Implemented dw_window_from_id() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 243 diff changeset	4828 EnumChildWindows(handle, _wfid, (LPARAM)id);
c097ffe6cfeb Implemented dw_window_from_id() on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 243 diff changeset	4829 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	4830 }
248 0f9a185deeb6 Minor change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 247 diff changeset	4831
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4832 /*
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4833 * Pack windows (widgets) into a box from the start (or top).
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4834 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4835 * box: Window handle of the box to be packed into.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4836 * item: Window handle of the item to be back.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4837 * width: Width in pixels of the item or -1 to be self determined.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4838 * height: Height in pixels of the item or -1 to be self determined.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4839 * hsize: TRUE if the window (widget) should expand horizontally to fill space given.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4840 * vsize: TRUE if the window (widget) should expand vertically to fill space given.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4841 * pad: Number of pixels of padding around the item.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4842 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4843 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	4844 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4845 Box *thisbox;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4846
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	4847 /*
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	4848 * 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	4849 * 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	4850 */
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	4851 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	4852 {
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	4853 dw_messagebox("dw_box_pack_start()", DW_MB_OK\|DW_MB_ERROR, "Danger! Danger! Will Robinson; box and item are the same!",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	4854 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	4855 }
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	4856
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	4857 thisbox = (Box *)GetWindowLongPtr(box, GWLP_USERDATA);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4858 if(thisbox)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4859 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4860 int z;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4861 Item tmpitem, thisitem = thisbox->items;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4862 char tmpbuf[100];
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4863
14 176cee043f1b Lots of Windows and Unix bug fixes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 12 diff changeset	4864 tmpitem = malloc(sizeof(Item)*(thisbox->count+1));
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4865
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4866 for(z=0;z<thisbox->count;z++)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4867 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4868 tmpitem[z] = thisitem[z];
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4869 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4870
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4871 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	4872
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	4873 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	4874 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	4875 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	4876 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	4877
440 9af47c551a56 Noticed an artifact from the OS/2 port that was incorrect. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 439 diff changeset	4878 if(strnicmp(tmpbuf, FRAMECLASSNAME, strlen(FRAMECLASSNAME)+1)==0)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4879 tmpitem[thisbox->count].type = TYPEBOX;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4880 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	4881 {
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	4882 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	4883 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	4884 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	4885 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	4886
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4887 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	4888 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4889
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4890 tmpitem[thisbox->count].hwnd = item;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4891 tmpitem[thisbox->count].origwidth = tmpitem[thisbox->count].width = width;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4892 tmpitem[thisbox->count].origheight = tmpitem[thisbox->count].height = height;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4893 tmpitem[thisbox->count].pad = pad;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4894 if(hsize)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4895 tmpitem[thisbox->count].hsize = SIZEEXPAND;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4896 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4897 tmpitem[thisbox->count].hsize = SIZESTATIC;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4898
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4899 if(vsize)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4900 tmpitem[thisbox->count].vsize = SIZEEXPAND;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4901 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4902 tmpitem[thisbox->count].vsize = SIZESTATIC;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4903
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4904 thisbox->items = tmpitem;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4905
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4906 if(thisbox->count)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4907 free(thisitem);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4908
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4909 thisbox->count++;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4910
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4911 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	4912 if(strncmp(tmpbuf, UPDOWN_CLASS, strlen(UPDOWN_CLASS)+1)==0)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4913 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	4914 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	4915
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4916 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	4917 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4918 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	4919 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	4920 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	4921 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4922 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4923 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4924 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4925
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4926 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4927 * Sets the size of a given window (widget).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4928 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4929 * handle: Window (widget) handle.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4930 * width: New width in pixels.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4931 * height: New height in pixels.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4932 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4933 void API dw_window_set_usize(HWND handle, ULONG width, ULONG height)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4934 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4935 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	4936 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4937
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4938 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4939 * Returns the width of the screen.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4940 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4941 int API dw_screen_width(void)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4942 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4943 return GetSystemMetrics(SM_CXSCREEN);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4944 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4945
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4946 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4947 * Returns the height of the screen.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4948 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4949 int API dw_screen_height(void)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4950 {
58 5c66a108aa47 Fixed 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 return GetSystemMetrics(SM_CYSCREEN);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4952 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4953
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4954 /* This should return the current color depth */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4955 unsigned long API dw_color_depth(void)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4956 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4957 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	4958 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	4959
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4960 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	4961
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4962 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	4963
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4964 return bpp;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4965 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4966
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4967
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4968 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4969 * Sets the position of a given window (widget).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4970 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4971 * handle: Window (widget) handle.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4972 * x: X location from the bottom left.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4973 * y: Y location from the bottom left.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4974 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4975 void API dw_window_set_pos(HWND handle, ULONG x, ULONG y)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4976 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4977 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	4978 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4979
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4980 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4981 * Sets the position and size of a given window (widget).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4982 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4983 * handle: Window (widget) handle.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4984 * x: X location from the bottom left.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4985 * y: Y location from the bottom left.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4986 * width: Width of the widget.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4987 * height: Height of the widget.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4988 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	4989 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	4990 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	4991 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	4992 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4993
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4994 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4995 * Gets the position and size of a given window (widget).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4996 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4997 * handle: Window (widget) handle.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4998 * x: X location from the bottom left.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4999 * y: Y location from the bottom left.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5000 * width: Width of the widget.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5001 * height: Height of the widget.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5002 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5003 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	5004 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5005 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	5006
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5007 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	5008
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5009 GetWindowPlacement(handle, &wp);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5010 if(x)
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5011 *x = wp.rcNormalPosition.left;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5012 if(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	5013 *y = wp.rcNormalPosition.top;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5014 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	5015 *width = wp.rcNormalPosition.right - wp.rcNormalPosition.left;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5016 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	5017 *height = wp.rcNormalPosition.bottom - wp.rcNormalPosition.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	5018
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5019 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5020
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5021 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5022 * Sets the style of a given window (widget).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5023 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5024 * handle: Window (widget) handle.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5025 * width: New width in pixels.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5026 * height: New height in pixels.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5027 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5028 void API dw_window_set_style(HWND handle, ULONG style, ULONG mask)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5029 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5030 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	5031 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	5032
5c66a108aa47 Fixed 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 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	5034 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	5035 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	5036
88 58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	5037
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	5038 /* 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	5039 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	5040 {
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	5041
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	5042 if(cinfo)
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	5043 cinfo->vcenter = 1;
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	5044 else
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	5045 {
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	5046 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	5047 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	5048 cinfo->vcenter = 1;
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	5049
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	5050 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	5051 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	5052 }
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	5053 }
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	5054 else if(cinfo)
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	5055 cinfo->vcenter = 0;
58d8139fe0a2 Added vertical center logic for static text controls on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 87 diff changeset	5056
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5057 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	5058 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5059
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5060 /* 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	5061 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	5062 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5063 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	5064
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5065 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	5066 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5067 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	5068 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	5069 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5070 return -1;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5071 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5072
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5073 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5074 * Adds a new page to specified notebook.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5075 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5076 * handle: Window (widget) handle.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5077 * flags: Any additional page creation flags.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5078 * front: If TRUE page is added at the beginning.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5079 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5080 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	5081 {
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	5082 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	5083
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5084 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	5085 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5086 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	5087
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5088 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	5089 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5090 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	5091 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5092 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	5093 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	5094 }
5c66a108aa47 Fixed 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 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5096
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5097 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	5098 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	5099
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5100 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	5101 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5102 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	5103 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5104 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	5105
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5106 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	5107 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	5108 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	5109 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	5110 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	5111 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	5112
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5113 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	5114 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	5115
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5116 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	5117 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	5118 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5119 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5120 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5121 return -1;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5122 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5123
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5124 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5125 * Sets the text on the specified notebook tab.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5126 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5127 * handle: Notebook handle.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5128 * pageid: Page ID of the tab to set.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5129 * text: Pointer to the text to set.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5130 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5131 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	5132 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5133
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	5134 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	5135 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	5136
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5137 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	5138 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	5139
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5140 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	5141
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5142 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	5143 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5144 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	5145 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	5146 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	5147 _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	5148 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5149 }
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 * Sets the text on the specified notebook tab status area.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5153 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5154 * handle: Notebook handle.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5155 * pageid: Page ID of the tab to set.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5156 * text: Pointer to the text to set.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5157 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5158 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	5159 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5160 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5161
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5162 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5163 * Packs the specified box into the notebook page.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5164 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5165 * handle: Handle to the notebook to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5166 * pageid: Page ID in the notebook which is being packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5167 * page: Box handle to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5168 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5169 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	5170 {
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	5171 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	5172 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	5173
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5174 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	5175 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	5176
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5177 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	5178
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5179 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	5180 {
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	5181 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	5182
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5183 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	5184 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	5185 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	5186 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	5187 array[pageid]->hwnd = tmpbox;
5c66a108aa47 Fixed 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 if(pageidx == dw_notebook_page_query(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	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 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	5191 _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	5192 }
5c66a108aa47 Fixed 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 }
5c66a108aa47 Fixed 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 /*
5c66a108aa47 Fixed 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 * 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	5198 * 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	5199 * 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	5200 * 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	5201 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5202 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	5203 {
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	5204 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	5205 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	5206
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5207 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	5208 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	5209
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5210 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	5211
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5212 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	5213 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	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[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	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 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	5218 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	5219 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	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
5c66a108aa47 Fixed 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 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	5223
5c66a108aa47 Fixed 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 /* 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	5225 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	5226 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	5227 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	5228
5c66a108aa47 Fixed 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 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	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 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	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 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	5234 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	5235 }
5c66a108aa47 Fixed 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 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	5238 {
5c66a108aa47 Fixed 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 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	5240 _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	5241 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	5242 }
5c66a108aa47 Fixed 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
5c66a108aa47 Fixed 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 /*
5c66a108aa47 Fixed 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 * 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	5247 * 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	5248 * 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	5249 */
346 81fae15885d7 Implemented switch-page on OS/2, and changed the signal prototype to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 344 diff changeset	5250 unsigned long API dw_notebook_page_query(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	5251 {
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	5252 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	5253 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	5254
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5255 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	5256 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	5257 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	5258 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5259
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5260 /*
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5261 * 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	5262 * 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	5263 * 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	5264 * 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	5265 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5266 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	5267 {
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	5268 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	5269 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	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 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	5272 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	5273
5c66a108aa47 Fixed 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 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	5275
5c66a108aa47 Fixed 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 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	5277 {
5c66a108aa47 Fixed 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 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	5279
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5280 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	5281 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	5282
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5283 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	5284
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5285 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	5286 _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	5287 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5288 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5289
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5290 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5291 * Appends the specified text to the listbox's (or combobox) entry list.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5292 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5293 * handle: Handle to the listbox to be appended to.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5294 * text: Text to append into listbox.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5295 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5296 void API dw_listbox_append(HWND handle, char *text)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5297 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5298 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	5299
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5300 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	5301
371 e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5302 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	5303 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	5304 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	5305 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	5306 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	5307 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	5308 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	5309 0, (LPARAM)text);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5310 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5311
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5312 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5313 * Clears the listbox's (or combobox) list of all entries.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5314 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5315 * handle: Handle to the listbox to be cleared.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5316 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5317 void API dw_listbox_clear(HWND handle)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5318 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5319 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	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 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	5322
371 e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5323 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	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 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	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 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	5328 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	5329
5c66a108aa47 Fixed 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 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	5331 {
5c66a108aa47 Fixed 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 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	5333 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	5334 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5335 }
5c66a108aa47 Fixed 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 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	5337 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	5338 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	5339 }
5c66a108aa47 Fixed 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 /*
5c66a108aa47 Fixed 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 * 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	5343 * 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	5344 * 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	5345 * 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	5346 * 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	5347 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5348 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	5349 {
371 e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5350 char tmpbuf[100];
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5351
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5352 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	5353
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5354 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	5355 {
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5356 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	5357 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	5358 }
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5359 else
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5360 {
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5361 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	5362 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	5363 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	5364 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	5365 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	5366 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5367 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5368
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5369 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5370 * Copies the given index item's text into buffer.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5371 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5372 * handle: Handle to the listbox to be queried.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5373 * index: Index into the list to be queried.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5374 * buffer: Buffer where text will be copied.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5375 * length: Length of the buffer (including NULL).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5376 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5377 void API dw_listbox_query_text(HWND handle, unsigned int index, char *buffer, unsigned int length)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5378 {
351 84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5379 char tmpbuf[100];
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5380 int len;
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5381
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5382 if(!buffer \|\| !length)
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5383 return;
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5384
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5385 buffer[0] = 0;
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5386
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5387 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	5388
371 e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5389 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	5390 {
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5391 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	5392
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5393 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	5394 SendMessage(handle,
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5395 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	5396 }
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5397 else
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5398 {
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5399 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	5400
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5401 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	5402 SendMessage(handle,
84a24d739d12 Make dw_listbox_query_text() work on comboboxes on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 350 diff changeset	5403 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	5404 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5405 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5406
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5407 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5408 * Returns the index to the item in the list currently selected.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5409 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5410 * handle: Handle to the listbox to be queried.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5411 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5412 unsigned int API dw_listbox_selected(HWND handle)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5413 {
58 5c66a108aa47 Fixed 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 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	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 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	5417
371 e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5418 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	5419 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	5420 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	5421 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	5422
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5423 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	5424 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	5425 0, 0);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5426 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5427
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5428 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5429 * Returns the index to the current selected item or -1 when done.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5430 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5431 * handle: Handle to the listbox to be queried.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5432 * where: Either the previous return or -1 to restart.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5433 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5434 int API dw_listbox_selected_multi(HWND handle, int where)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5435 {
58 5c66a108aa47 Fixed 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 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	5437 char tmpbuf[100];
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5438
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5439 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	5440
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5441 /* 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	5442 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	5443 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	5444
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5445 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	5446 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	5447 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5448 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	5449 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	5450
5c66a108aa47 Fixed 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 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	5452 {
5c66a108aa47 Fixed 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 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	5454 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	5455 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	5456 }
5c66a108aa47 Fixed 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 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	5458 {
5c66a108aa47 Fixed 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 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	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 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	5462 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	5463 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	5464 }
5c66a108aa47 Fixed 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 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	5467 }
5c66a108aa47 Fixed 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 return -1;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5469 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5470
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5471 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5472 * Sets the selection state of a given index.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5473 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5474 * handle: Handle to the listbox to be set.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5475 * index: Item index.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5476 * state: TRUE if selected FALSE if unselected.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5477 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5478 void API dw_listbox_select(HWND handle, int index, int state)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5479 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5480 char tmpbuf[100];
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5481
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5482 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	5483
371 e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5484 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	5485 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	5486 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	5487 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5488 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	5489 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	5490 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5491 _wndproc(handle, WM_COMMAND, (WPARAM)(LBN_SELCHANGE << 16), (LPARAM)handle);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5492 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5493
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5494 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5495 * Deletes the item with given index from the list.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5496 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5497 * handle: Handle to the listbox to be set.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5498 * index: Item index.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5499 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5500 void API dw_listbox_delete(HWND handle, int index)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5501 {
371 e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5502 char tmpbuf[100];
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5503
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5504 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	5505
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5506 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	5507 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	5508 else
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5509 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	5510 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5511
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5512 /*
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5513 * 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	5514 * 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	5515 * 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	5516 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5517 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	5518 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5519 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	5520
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5521 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	5522
371 e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5523 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	5524 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	5525 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	5526
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5527 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	5528 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	5529 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5530
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5531 /*
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5532 * 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	5533 * 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	5534 * 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	5535 * 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	5536 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5537 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	5538 {
371 e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5539 char tmpbuf[100];
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5540
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5541 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	5542
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5543 /* 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	5544 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	5545 return;
e856f80e0520 Check for comboboxes in listbox functions, and handle missing events, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 370 diff changeset	5546
58 5c66a108aa47 Fixed 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 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	5548 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5549
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5550 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5551 * Adds text to an MLE box and returns the current point.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5552 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5553 * handle: Handle to the MLE to be queried.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5554 * buffer: Text buffer to be imported.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5555 * startpoint: Point to start entering text.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5556 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5557 unsigned int API dw_mle_import(HWND handle, char *buffer, int startpoint)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5558 {
95 636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5559 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	5560 char *tmpbuf;
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5561
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5562 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	5563 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	5564
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5565 startpoint++;
95 636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5566 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	5567
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5568 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	5569 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	5570
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5571 if(len)
37 360bc6a5f1c9 Sync with latest Dynamic Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 34 diff changeset	5572 {
95 636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5573 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	5574 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	5575
95 636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5576 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	5577
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5578 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	5579 start = &tmpbuf[startpoint];
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5580
58 5c66a108aa47 Fixed 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 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	5582 memcpy(dest, start, copylen);
37 360bc6a5f1c9 Sync with latest Dynamic Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 34 diff changeset	5583 }
95 636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5584 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	5585
5c66a108aa47 Fixed 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 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	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 free(tmpbuf);
95 636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5589 return (startpoint + textlen - 1);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5590 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5591
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5592 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5593 * Grabs text from an MLE box.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5594 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5595 * handle: Handle to the MLE to be queried.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5596 * buffer: Text buffer to be exported.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5597 * startpoint: Point to start grabbing text.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5598 * length: Amount of text to be grabbed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5599 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5600 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	5601 {
95 636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5602 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	5603 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	5604
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5605 if(len)
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5606 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	5607
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5608 buffer[0] = 0;
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5609
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5610 if(startpoint < len)
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5611 {
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5612 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	5613
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5614 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	5615 }
58 5c66a108aa47 Fixed 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
5c66a108aa47 Fixed 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 free(tmpbuf);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5618 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5619
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5620 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5621 * Obtains information about an MLE box.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5622 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5623 * handle: Handle to the MLE to be queried.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5624 * bytes: A pointer to a variable to return the total bytes.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5625 * lines: A pointer to a variable to return the number of lines.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5626 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5627 void API dw_mle_query(HWND handle, unsigned long bytes, unsigned long lines)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5628 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5629 if(bytes)
95 636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5630 *bytes = GetWindowTextLength(handle);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5631 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	5632 *lines = (unsigned long)SendMessage(handle, EM_GETLINECOUNT, 0, 0);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5633 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5634
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5635 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5636 * Deletes text from an MLE box.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5637 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5638 * handle: Handle to the MLE to be deleted from.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5639 * startpoint: Point to start deleting text.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5640 * length: Amount of text to be deleted.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5641 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5642 void API dw_mle_delete(HWND handle, int startpoint, int length)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5643 {
95 636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5644 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	5645 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	5646
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5647 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	5648
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5649 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	5650 {
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5651 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	5652
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5653 SetWindowText(handle, tmpbuf);
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5654 }
58 5c66a108aa47 Fixed 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
5c66a108aa47 Fixed 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 free(tmpbuf);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5657 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5658
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5659 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5660 * Clears all text from an MLE box.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5661 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5662 * handle: Handle to the MLE to be cleared.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5663 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5664 void API dw_mle_clear(HWND handle)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5665 {
58 5c66a108aa47 Fixed 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 SetWindowText(handle, "");
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5667 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5668
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5669 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5670 * Sets the visible line of an MLE box.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5671 * 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	5672 * handle: Handle to the MLE.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5673 * line: Line to be visible.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5674 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5675 void API dw_mle_set_visible(HWND handle, int line)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5676 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5677 int point = (int)SendMessage(handle, EM_LINEINDEX, (WPARAM)line, 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	5678 dw_mle_set(handle, point);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5679 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5680
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5681 /*
7 005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	5682 * Sets the editablity of an MLE box.
005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	5683 * Parameters:
005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	5684 * handle: Handle to the MLE.
005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	5685 * 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	5686 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5687 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	5688 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5689 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	5690 }
005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	5691
005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	5692 /*
005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	5693 * Sets the word wrap state of an MLE box.
005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	5694 * Parameters:
005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	5695 * handle: Handle to the MLE.
005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	5696 * 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	5697 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5698 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	5699 {
58 5c66a108aa47 Fixed 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 /* 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	5701 * 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	5702 */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5703 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	5704 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	5705 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	5706 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	5707 }
005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	5708
005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	5709 /*
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5710 * Sets the current cursor position of an MLE box.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5711 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5712 * handle: Handle to the MLE to be positioned.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5713 * point: Point to position cursor.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5714 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5715 void API dw_mle_set(HWND handle, int point)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5716 {
389 23a603b136bd Change call to SendMessage() to make dw_mle_set() actually work. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 388 diff changeset	5717 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	5718 SendMessage(handle, EM_SCROLLCARET, 0, 0);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5719 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5720
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5721 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5722 * Finds text in an MLE box.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5723 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5724 * handle: Handle to the MLE to be cleared.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5725 * text: Text to search for.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5726 * point: Start point of search.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5727 * flags: Search specific flags.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5728 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5729 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	5730 {
95 636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5731 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	5732 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	5733 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	5734
636c37ca7238 Avoid allocating super huge buffers when dealing with the MLEs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 93 diff changeset	5735 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	5736
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5737 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	5738
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5739 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	5740 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5741 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	5742 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5743 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	5744 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	5745 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5746 }
5c66a108aa47 Fixed 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 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	5748 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5749 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	5750 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5751 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	5752 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	5753 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5754 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5755
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5756 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	5757 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5758 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	5759 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	5760 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5761
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5762 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	5763
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5764 return retval;
3 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 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5768 * Stops redrawing of an MLE box.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5769 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5770 * handle: Handle to the MLE to freeze.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5771 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5772 void API dw_mle_freeze(HWND handle)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5773 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5774 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5775
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5776 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5777 * Resumes redrawing of an MLE box.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5778 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5779 * handle: Handle to the MLE to thaw.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5780 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5781 void API dw_mle_thaw(HWND handle)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5782 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5783 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5784
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5785 /*
33 72675de7d229 Renamed slider class to percent class. Implemented my own percent widget bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 32 diff changeset	5786 * Returns the range of the percent bar.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5787 * 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	5788 * handle: Handle to the percent bar to be queried.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5789 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5790 unsigned int API dw_percent_query_range(HWND handle)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5791 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5792 return (unsigned int)SendMessage(handle, PBM_GETRANGE, (WPARAM)FALSE, 0);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5793 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5794
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5795 /*
33 72675de7d229 Renamed slider class to percent class. Implemented my own percent widget bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 32 diff changeset	5796 * Sets the percent bar position.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5797 * 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	5798 * 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	5799 * position: Position of the percent bar withing the range.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5800 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5801 void API dw_percent_set_pos(HWND handle, unsigned int position)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5802 {
58 5c66a108aa47 Fixed 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 SendMessage(handle, PBM_SETPOS, (WPARAM)position, 0);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5804 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5805
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5806 /*
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5807 * 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	5808 * Parameters:
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5809 * 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	5810 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5811 unsigned int API dw_slider_query_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	5812 {
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5813 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	5814 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	5815
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5816 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	5817 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	5818 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	5819 }
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5820
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5821 /*
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5822 * 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	5823 * Parameters:
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5824 * 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	5825 * 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	5826 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5827 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	5828 {
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5829 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	5830 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	5831
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5832 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	5833 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	5834 else
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5835 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	5836 }
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5837
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5838 /*
197 f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5839 * 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	5840 * Parameters:
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5841 * 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	5842 */
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5843 unsigned int API dw_scrollbar_query_pos(HWND handle)
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5844 {
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5845 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	5846 }
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5847
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5848 /*
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5849 * 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	5850 * Parameters:
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5851 * 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	5852 * 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	5853 */
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5854 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	5855 {
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5856 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	5857 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	5858 }
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5859
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5860 /*
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5861 * 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	5862 * Parameters:
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5863 * 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	5864 * 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	5865 * 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	5866 */
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	5867 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	5868 {
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	5869 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	5870
098ed34d41fb The basics of the new scrollbar code on Windows, and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 201 diff changeset	5871 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	5872 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	5873 si.nMin = 0;
209 85f25e8c1b1e nMax is inclusive or exclusive? bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 204 diff changeset	5874 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	5875 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	5876 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	5877 }
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5878
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	5879 /*
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5880 * Sets the spinbutton value.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5881 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5882 * handle: Handle to the spinbutton to be set.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5883 * position: Current value of the spinbutton.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5884 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5885 void API dw_spinbutton_set_pos(HWND handle, long position)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5886 {
58 5c66a108aa47 Fixed 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 char tmpbuf[100];
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	5888 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	5889
5c66a108aa47 Fixed 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 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	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 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	5893 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	5894
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	5895 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	5896 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	5897 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	5898 SendMessage(handle, UDM_SETPOS, 0, (LPARAM)MAKELONG((short)position, 0));
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5899 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5900
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5901 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5902 * Sets the spinbutton limits.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5903 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5904 * 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	5905 * 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	5906 * position: Current value of the spinbutton.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5907 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5908 void API dw_spinbutton_set_limits(HWND handle, long upper, long lower)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5909 {
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	5910 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	5911 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	5912 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	5913 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	5914 (LPARAM)((short)upper));
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5915 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5916
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5917 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5918 * Sets the entryfield character limit.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5919 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5920 * handle: Handle to the spinbutton to be set.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5921 * limit: Number of characters the entryfield will take.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5922 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5923 void API dw_entryfield_set_limit(HWND handle, ULONG limit)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5924 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5925 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	5926 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5927
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5928 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5929 * Returns the current value of the spinbutton.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5930 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5931 * handle: Handle to the spinbutton to be queried.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5932 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5933 long API dw_spinbutton_query(HWND handle)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5934 {
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	5935 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	5936 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	5937 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	5938 return (long)SendMessage(handle, UDM_GETPOS, 0, 0);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5939 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5940
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5941 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5942 * Returns the state of the checkbox.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5943 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5944 * handle: Handle to the checkbox to be queried.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5945 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5946 int API dw_checkbox_query(HWND handle)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5947 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5948 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	5949 return (in_checkbox_handler ? FALSE : TRUE);
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	5950 return (in_checkbox_handler ? TRUE : FALSE);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5951 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5952
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5953 /* 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	5954 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	5955 {
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5956 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	5957
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5958 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	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 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	5961 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	5962 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	5963
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5964 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	5965 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	5966 }
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5967 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	5968 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5969 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5970 * Sets the state of the checkbox.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5971 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5972 * handle: Handle to the checkbox to be queried.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5973 * value: TRUE for checked, FALSE for unchecked.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5974 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	5975 void API dw_checkbox_set(HWND handle, int value)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5976 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	5977 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	5978
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5979 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	5980 {
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5981 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	5982
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	5983 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	5984 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	5985 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	5986 SendMessage(handle, BM_SETCHECK, (WPARAM)value, 0);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5987 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5988
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5989 /*
60 61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	5990 * 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	5991 * Parameters:
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	5992 * 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	5993 * 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	5994 * title: The text title of the entry.
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	5995 * icon: Handle to coresponding icon.
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	5996 * parent: Parent handle or 0 if root.
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	5997 * itemdata: Item specific data.
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	5998 */
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	5999 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	6000 {
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6001 TVITEM tvi;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6002 TVINSERTSTRUCT tvins;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6003 HTREEITEM hti;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6004 void *ptrs= malloc(sizeof(void ) * 2);
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6005
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6006 ptrs[0] = title;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6007 ptrs[1] = itemdata;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6008
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6009 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	6010 tvi.pszText = title;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6011 tvi.lParam = (LONG)ptrs;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6012 tvi.cchTextMax = strlen(title);
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6013 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	6014
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6015 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	6016 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	6017 tvins.hInsertAfter = item ? item : TVI_FIRST;
60 61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6018
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6019 hti = TreeView_InsertItem(handle, &tvins);
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6020
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	6021 return hti;
60 61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6022 }
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6023
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6024 /*
22 6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6025 * 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	6026 * Parameters:
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6027 * 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	6028 * 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	6029 * 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	6030 * 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	6031 * 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	6032 */
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	6033 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	6034 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6035 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	6036 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	6037 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	6038 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	6039
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6040 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	6041 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	6042
5c66a108aa47 Fixed 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 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	6044 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	6045 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	6046 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	6047 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	6048
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6049 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	6050 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	6051 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	6052
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6053 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	6054
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	6055 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	6056 }
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6057
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6058 /*
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	6059 * 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	6060 * 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	6061 * 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	6062 * 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	6063 * 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	6064 * 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	6065 */
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	6066 void API dw_tree_set(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	6067 {
58 5c66a108aa47 Fixed 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 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	6069 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	6070
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6071 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	6072 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	6073
60 61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6074 if(TreeView_GetItem(handle, &tvi))
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6075 {
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6076
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6077 ptrs = (void **)tvi.lParam;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6078 ptrs[0] = title;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6079
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6080 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	6081 tvi.pszText = title;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6082 tvi.cchTextMax = strlen(title);
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6083 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	6084 tvi.hItem = (HTREEITEM)item;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6085
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6086 TreeView_SetItem(handle, &tvi);
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6087 }
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	6088 }
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	6089
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	6090 /*
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	6091 * 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	6092 * 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	6093 * 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	6094 * 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	6095 * 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	6096 */
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	6097 void API dw_tree_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	6098 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6099 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	6100 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	6101
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6102 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	6103 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	6104
60 61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6105 if(TreeView_GetItem(handle, &tvi))
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6106 {
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6107 ptrs = (void **)tvi.lParam;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6108 ptrs[1] = itemdata;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6109 }
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	6110 }
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	6111
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	6112 /*
317 83edbd751da9 Added dw_tree_get_data() to get a tree item's data. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 312 diff changeset	6113 * 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	6114 * Parameters:
83edbd751da9 Added dw_tree_get_data() to get a tree item's data. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 312 diff changeset	6115 * 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	6116 * 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	6117 */
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	6118 void * API dw_tree_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	6119 {
83edbd751da9 Added dw_tree_get_data() to get a tree item's data. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 312 diff changeset	6120 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	6121 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	6122
83edbd751da9 Added dw_tree_get_data() to get a tree item's data. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 312 diff changeset	6123 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	6124 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	6125
83edbd751da9 Added dw_tree_get_data() to get a tree item's data. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 312 diff changeset	6126 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	6127 {
83edbd751da9 Added dw_tree_get_data() to get a tree item's data. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 312 diff changeset	6128 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	6129 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	6130 }
83edbd751da9 Added dw_tree_get_data() to get a tree item's data. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 312 diff changeset	6131 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	6132 }
83edbd751da9 Added dw_tree_get_data() to get a tree item's data. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 312 diff changeset	6133
83edbd751da9 Added dw_tree_get_data() to get a tree item's data. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 312 diff changeset	6134 /*
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	6135 * 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	6136 * 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	6137 * 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	6138 * 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	6139 */
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	6140 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	6141 {
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	6142 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	6143 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	6144 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	6145 }
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	6146
291 70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6147 /* Delete all tree subitems */
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6148 void _dw_tree_delete_recursive(HWND handle, HTREEITEM node)
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6149 {
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6150 HTREEITEM hti;
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6151
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6152 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	6153
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6154 while(hti)
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6155 {
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6156 HTREEITEM lastitem = hti;
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6157
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6158 hti = TreeView_GetNextSibling(handle, hti);
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	6159 dw_tree_delete(handle, lastitem);
291 70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6160 }
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6161 }
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6162
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	6163 /*
30 b1d7e8a28dfa Added tree view functions and signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 22 diff changeset	6164 * Removes all nodes from a tree.
b1d7e8a28dfa Added tree view functions and signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 22 diff changeset	6165 * Parameters:
b1d7e8a28dfa Added tree view functions and signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 22 diff changeset	6166 * 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	6167 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6168 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	6169 {
291 70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6170 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	6171
388 6b573770f446 Stop select events during dw_tree_clear(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 371 diff changeset	6172 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	6173 while(hti)
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6174 {
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6175 HTREEITEM lastitem = hti;
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6176
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6177 _dw_tree_delete_recursive(handle, hti);
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6178 hti = TreeView_GetNextSibling(handle, hti);
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	6179 dw_tree_delete(handle, lastitem);
291 70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6180 }
388 6b573770f446 Stop select events during dw_tree_clear(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 371 diff changeset	6181 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	6182 }
b1d7e8a28dfa Added tree view functions and signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 22 diff changeset	6183
b1d7e8a28dfa Added tree view functions and signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 22 diff changeset	6184 /*
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	6185 * 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	6186 * 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	6187 * 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	6188 * 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	6189 */
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	6190 void API dw_tree_expand(HWND handle, HTREEITEM item)
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	6191 {
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	6192 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	6193 }
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
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 /*
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 * 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	6197 * 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	6198 * 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	6199 * 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	6200 */
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	6201 void API dw_tree_collapse(HWND handle, HTREEITEM item)
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	6202 {
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 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	6204 }
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	6205
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	6206 /*
30 b1d7e8a28dfa Added tree view functions and signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 22 diff changeset	6207 * Removes a node from a tree.
b1d7e8a28dfa Added tree view functions and signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 22 diff changeset	6208 * Parameters:
b1d7e8a28dfa Added tree view functions and signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 22 diff changeset	6209 * 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	6210 * item: Handle to node to be deleted.
b1d7e8a28dfa Added tree view functions and signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 22 diff changeset	6211 */
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	6212 void API dw_tree_delete(HWND handle, HTREEITEM item)
30 b1d7e8a28dfa Added tree view functions and signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 22 diff changeset	6213 {
291 70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6214 TVITEM tvi;
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6215 void **ptrs;
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6216
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	6217 if(item == TVI_ROOT \|\| !item)
60 61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6218 return;
61869769c050 Sync with the latest DW code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 59 diff changeset	6219
291 70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6220 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	6221 tvi.hItem = item;
291 70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6222
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6223 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	6224 ptrs = (void **)tvi.lParam;
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6225
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	6226 _dw_tree_delete_recursive(handle, item);
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	6227 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	6228 if(ptrs)
70480069392b Fixed memory leak in the tree control on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 284 diff changeset	6229 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	6230 }
30 b1d7e8a28dfa Added tree view functions and signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 22 diff changeset	6231
b1d7e8a28dfa Added tree view functions and signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 22 diff changeset	6232 /*
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6233 * Sets up the container columns.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6234 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6235 * handle: Handle to the container to be configured.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6236 * flags: An array of unsigned longs with column flags.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6237 * titles: An array of strings with column text titles.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6238 * count: The number of columns (this should match the arrays).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6239 * 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	6240 * (only used on OS/2 but must be >= 0 on all)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6241 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6242 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	6243 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	6244 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	6245 int z, l = 0;
105 ad95fc623ff3 Some changes to the container optimization code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 104 diff changeset	6246 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	6247 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	6248
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6249 if(separator == -1)
105 ad95fc623ff3 Some changes to the container optimization code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 104 diff changeset	6250 {
ad95fc623ff3 Some changes to the container optimization code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 104 diff changeset	6251 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	6252 l = 1;
105 ad95fc623ff3 Some changes to the container optimization code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 104 diff changeset	6253 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6254
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6255 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	6256 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	6257 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	6258 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	6259
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6260
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6261 for(z=0;z<count;z++)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6262 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6263 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	6264 {
355 3a71623fc219 Changes to implement justification on container columns. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 351 diff changeset	6265 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	6266 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	6267 lvc.cchTextMax = strlen(titles[z]);
355 3a71623fc219 Changes to implement justification on container columns. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 351 diff changeset	6268 if(flags[z] & DW_CFA_RIGHT)
3a71623fc219 Changes to implement justification on container columns. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 351 diff changeset	6269 lvc.fmt = LVCFMT_RIGHT;
3a71623fc219 Changes to implement justification on container columns. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 351 diff changeset	6270 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	6271 lvc.fmt = LVCFMT_CENTER;
3a71623fc219 Changes to implement justification on container columns. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 351 diff changeset	6272 else
3a71623fc219 Changes to implement justification on container columns. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 351 diff changeset	6273 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	6274 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	6275 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	6276 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	6277 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6278 }
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	6279 ListView_SetExtendedListViewStyle(handle, LVS_EX_FULLROWSELECT \| LVS_EX_SUBITEMIMAGES);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6280 return TRUE;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6281 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6282
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6283 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6284 * Sets up the filesystem columns, note: filesystem always has an icon/filename field.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6285 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6286 * handle: Handle to the container to be configured.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6287 * flags: An array of unsigned longs with column flags.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6288 * titles: An array of strings with column text titles.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6289 * count: The number of columns (this should match the arrays).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6290 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6291 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	6292 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6293 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	6294
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6295 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	6296 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	6297 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	6298 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	6299 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	6300 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	6301 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	6302 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	6303 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	6304 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	6305 dw_container_setup(handle, flags, titles, count, -1);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6306 return TRUE;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6307 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6308
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6309 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6310 * Obtains an icon from a module (or header in GTK).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6311 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6312 * module: Handle to module (DLL) in OS/2 and Windows.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6313 * id: A unsigned long id int the resources on OS/2 and
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6314 * Windows, on GTK this is converted to a pointer
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6315 * to an embedded XPM.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6316 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6317 unsigned long API dw_icon_load(unsigned long module, unsigned long id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6318 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6319 return (unsigned long)LoadIcon(DWInstance, MAKEINTRESOURCE(id));
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6320 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6321
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6322 /*
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	6323 * 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	6324 * 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	6325 * 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	6326 * 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	6327 * (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	6328 */
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	6329 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	6330 {
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	6331 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	6332 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	6333
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	6334 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	6335 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	6336
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	6337 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	6338
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	6339 /* 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	6340 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	6341 {
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	6342 /* 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	6343 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	6344 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	6345 {
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	6346 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	6347 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	6348 }
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	6349 }
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	6350 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	6351 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	6352 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	6353 }
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	6354
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	6355 /*
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6356 * Frees a loaded resource in OS/2 and Windows.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6357 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6358 * handle: Handle to icon returned by dw_icon_load().
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6359 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6360 void API dw_icon_free(unsigned long handle)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6361 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6362 DestroyIcon((HICON)handle);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6363 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6364
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6365 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6366 * Allocates memory used to populate a container.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6367 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6368 * handle: Handle to the container window (widget).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6369 * rowcount: The number of items to be populated.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6370 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6371 void * API dw_container_alloc(HWND handle, int rowcount)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6372 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6373 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	6374 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	6375
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6376 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	6377 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	6378 /* 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	6379 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	6380 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	6381 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	6382 lvi.iImage = -1;
7 005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	6383
79 8082cb0e7c2e Updated to the latest DW. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 75 diff changeset	6384 ShowWindow(handle, SW_HIDE);
7 005fa766e8c2 Updates to latest build. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	6385 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	6386 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	6387 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	6388 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6389
5c66a108aa47 Fixed 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 /* 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	6391 * 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	6392 */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6393 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	6394 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6395 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	6396 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	6397
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6398 if(!hSmall \|\| !hLarge)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6399 {
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	6400 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	6401 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	6402 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6403 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	6404 {
5c66a108aa47 Fixed 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 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	6406 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6407 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	6408 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	6409 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	6410 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	6411 {
5c66a108aa47 Fixed 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 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	6413 }
5c66a108aa47 Fixed 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 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	6415 {
5c66a108aa47 Fixed 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 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	6417 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	6418 }
5c66a108aa47 Fixed 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 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	6420 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	6421 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6422
5c66a108aa47 Fixed 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(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	6424 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6425 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	6426 {
5c66a108aa47 Fixed 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 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	6428 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6429 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	6430 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6431 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	6432 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6433 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	6434 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	6435 }
5c66a108aa47 Fixed 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 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	6437 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6438 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	6439 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6440 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6441 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	6442 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6443
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6444 /*
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6445 * 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	6446 * 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	6447 * 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	6448 * 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	6449 * 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	6450 * 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	6451 * 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	6452 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6453 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	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 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	6456
5c66a108aa47 Fixed 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 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	6458 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	6459 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	6460 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	6461 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	6462 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	6463
5c66a108aa47 Fixed 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 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	6465 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6466
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6467 /*
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6468 * 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	6469 * 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	6470 * 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	6471 * 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	6472 * 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	6473 * 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	6474 * 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	6475 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6476 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	6477 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6478 dw_container_set_item(handle, pointer, column + 1, row, data);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6479 }
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 * Sets an item in specified row and column to the given data.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6483 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6484 * handle: Handle to the container window (widget).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6485 * pointer: Pointer to the allocated memory in dw_container_alloc().
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6486 * column: Zero based column of data being set.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6487 * row: Zero based row of data being set.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6488 * data: Pointer to the data to be added.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6489 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6490 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	6491 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	6492 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	6493 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	6494 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	6495 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	6496
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6497 if(!cinfo \|\| !cinfo->flags \|\| !data)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6498 return;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6499
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6500 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	6501
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6502 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	6503 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	6504 lvi.iSubItem = column;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6505
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6506 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	6507 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6508 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	6509
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6510 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	6511 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	6512 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	6513
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6514 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	6515 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6516 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	6517 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6518 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	6519
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6520 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	6521 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	6522
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6523 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	6524 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	6525 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	6526 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6527 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	6528 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6529 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	6530
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6531 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	6532
5c66a108aa47 Fixed 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 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	6534 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	6535 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6536 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	6537 {
165 d03716228b7f Use strftime to display time and date on Windows and unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 161 diff changeset	6538 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	6539 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	6540
d03716228b7f Use strftime to display time and date on Windows and unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 161 diff changeset	6541 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	6542 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	6543 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	6544
d03716228b7f Use strftime to display time and date on Windows and unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 161 diff changeset	6545 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	6546
58 5c66a108aa47 Fixed 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 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	6548 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	6549 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6550 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	6551 {
165 d03716228b7f Use strftime to display time and date on Windows and unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 161 diff changeset	6552 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	6553 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	6554
d03716228b7f Use strftime to display time and date on Windows and unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 161 diff changeset	6555 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	6556 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	6557 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	6558
d03716228b7f Use strftime to display time and date on Windows and unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 161 diff changeset	6559 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	6560
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6561 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	6562 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	6563 }
5c66a108aa47 Fixed 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 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	6566 }
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6567
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6568 /*
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6569 * 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	6570 * Parameters:
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6571 * 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	6572 * 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	6573 * 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	6574 * 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	6575 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6576 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	6577 {
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6578 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	6579 }
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6580
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6581 /*
22 6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6582 * 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	6583 * Parameters:
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6584 * 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	6585 * 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	6586 * 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	6587 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6588 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	6589 {
58 5c66a108aa47 Fixed 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 ListView_SetColumnWidth(handle, column, width);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6591 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6592
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6593 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6594 * Sets the title of a row in the container.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6595 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6596 * pointer: Pointer to the allocated memory in dw_container_alloc().
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6597 * row: Zero based row of data being set.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6598 * title: String title of the item.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6599 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6600 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	6601 {
58 5c66a108aa47 Fixed 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 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	6603 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	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 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	6606 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	6607 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	6608 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	6609
5c66a108aa47 Fixed 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 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	6611 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	6612
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6613 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6614
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6615 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6616 * Sets the title of a row in the container.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6617 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6618 * handle: Handle to the container window (widget).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6619 * pointer: Pointer to the allocated memory in dw_container_alloc().
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6620 * rowcount: The number of rows to be inserted.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6621 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6622 void API dw_container_insert(HWND handle, void *pointer, int rowcount)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6623 {
79 8082cb0e7c2e Updated to the latest DW. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 75 diff changeset	6624 ShowWindow(handle, SW_SHOW);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6625 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6626
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6627 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6628 * Removes all rows from a container.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6629 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6630 * 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	6631 * 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	6632 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6633 void API dw_container_clear(HWND handle, int redraw)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6634 {
58 5c66a108aa47 Fixed 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 ListView_DeleteAllItems(handle);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6636 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6637
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6638 /*
22 6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6639 * 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	6640 * Parameters:
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6641 * 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	6642 * 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	6643 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6644 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	6645 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6646 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	6647
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6648 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	6649 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6650 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	6651 }
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6652 }
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6653
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6654 /*
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6655 * 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	6656 * Parameters:
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6657 * 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	6658 * 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	6659 * 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	6660 * 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	6661 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6662 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	6663 {
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6664 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	6665 {
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6666 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	6667 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	6668 break;
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6669 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	6670 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	6671 break;
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6672 }
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6673 }
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6674
6a246b3bb14f Added tree widgets, fixed some delete event processing, fixed a layout bug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 17 diff changeset	6675 /*
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6676 * Starts a new query of a container.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6677 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6678 * handle: Handle to the window (widget) to be queried.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6679 * flags: If this parameter is DW_CRA_SELECTED it will only
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6680 * return items that are currently selected. Otherwise
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6681 * it will return all records in the container.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6682 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6683 char * API dw_container_query_start(HWND handle, unsigned long flags)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6684 {
58 5c66a108aa47 Fixed 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 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	6686
69 9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6687 _index = ListView_GetNextItem(handle, -1, flags);
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6688
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6689 if(_index == -1)
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6690 return NULL;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6691
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6692 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	6693
5c66a108aa47 Fixed 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.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	6695 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	6696
5c66a108aa47 Fixed 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 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	6698
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6699 return (char *)lvi.lParam;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6700 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6701
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6702 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6703 * Continues an existing query of a container.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6704 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6705 * handle: Handle to the window (widget) to be queried.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6706 * flags: If this parameter is DW_CRA_SELECTED it will only
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6707 * return items that are currently selected. Otherwise
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6708 * it will return all records in the container.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6709 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6710 char * API dw_container_query_next(HWND handle, unsigned long flags)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6711 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6712 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	6713
69 9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6714 _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	6715
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6716 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	6717 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	6718
69 9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6719 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	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.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	6722 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	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 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	6725
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6726 return (char *)lvi.lParam;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6727 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6728
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6729 /*
69 9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6730 * 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	6731 * Parameters:
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6732 * 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	6733 * 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	6734 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6735 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	6736 {
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6737 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	6738
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6739 while(index != -1)
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6740 {
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6741 LV_ITEM lvi;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6742
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6743 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	6744
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6745 lvi.iItem = index;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6746 lvi.mask = LVIF_PARAM;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6747
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6748 ListView_GetItem(handle, &lvi);
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6749
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6750 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	6751 {
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6752 RECT viewport, item;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6753
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6754 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	6755 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	6756 return;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6757 }
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6758
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6759 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	6760 }
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6761 }
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6762
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6763 /*
167 0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6764 * 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	6765 * Parameters:
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6766 * 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	6767 * 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	6768 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6769 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	6770 {
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6771 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	6772
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6773 while(index != -1)
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6774 {
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6775 LV_ITEM lvi;
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6776
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6777 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	6778
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6779 lvi.iItem = index;
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6780 lvi.mask = LVIF_PARAM;
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6781
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6782 ListView_GetItem(handle, &lvi);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6783
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6784 if((char *)lvi.lParam == text)
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6785 {
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6786 ListView_DeleteItem(handle, index);
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6787 return;
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6788 }
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6789
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6790 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	6791 }
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6792 }
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6793
0b3debaa9c6c Added new container functions, and fixed resource leaks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 165 diff changeset	6794 /*
69 9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6795 * 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	6796 * Parameters:
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6797 * 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	6798 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6799 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	6800 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	6801 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	6802 ULONG *flags;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6803 LV_ITEM lvi;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6804
102 372a7581b312 Minor changes to the container code on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 95 diff changeset	6805 if(cinfo && cinfo->columns == 1)
372a7581b312 Minor changes to the container code on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 95 diff changeset	6806 {
372a7581b312 Minor changes to the container code on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 95 diff changeset	6807 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	6808 }
372a7581b312 Minor changes to the container code on windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 95 diff changeset	6809 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	6810 {
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6811 int z, index;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6812 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	6813 char *text = malloc(1024);
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6814
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6815 /* 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	6816 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	6817 {
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6818 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	6819 columns[z] = 5;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6820 else
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6821 {
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6822 LVCOLUMN lvc;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6823
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6824 lvc.mask = LVCF_TEXT;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6825 lvc.cchTextMax = 1023;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6826 lvc.pszText = text;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6827
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6828 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	6829 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	6830
ad95fc623ff3 Some changes to the container optimization code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 104 diff changeset	6831 if(flags[z] & DW_CFA_RESERVED)
ad95fc623ff3 Some changes to the container optimization code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 104 diff changeset	6832 columns[z] += 20;
69 9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6833 }
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6834 }
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6835
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6836 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	6837
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6838 /* 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	6839 while(index != -1)
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6840 {
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6841 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	6842 {
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6843 LV_ITEM lvi;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6844
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6845 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	6846
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6847 lvi.iItem = index;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6848 lvi.iSubItem = z;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6849 lvi.mask = LVIF_TEXT;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6850 lvi.cchTextMax = 1023;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6851 lvi.pszText = text;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6852
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6853 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	6854 {
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6855 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	6856 if(width > columns[z])
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6857 {
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6858 if(z == 0)
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6859 columns[z] = width + 20;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6860 else
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6861 columns[z] = width;
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6862 }
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6863 }
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6864 }
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6865
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6866 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	6867 }
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6868
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6869 /* Set the new sizes */
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6870 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	6871 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	6872
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6873 free(columns);
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6874 free(text);
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6875 }
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6876 }
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6877
9510897c0b03 Added new container functions, and implemented some missing functionality. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 68 diff changeset	6878 /*
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6879 * Creates a rendering context widget (window) to be packed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6880 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6881 * id: An id to be used with dw_window_from_id.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6882 * Returns:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6883 * A handle to the widget or NULL on failure.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6884 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6885 HWND API dw_render_new(unsigned long id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6886 {
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	6887 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	6888 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	6889 "",
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	6890 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	6891 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	6892 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	6893 (HMENU)id,
109 94d273843a41 Use DWInstance, and some updates to the spinbutton hack. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 107 diff changeset	6894 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	6895 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	6896 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	6897 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	6898 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	6899 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	6900 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	6901 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	6902
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	6903 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	6904 return tmp;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6905 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6906
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6907 /* Sets the current foreground drawing color.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6908 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6909 * red: red value.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6910 * green: green value.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6911 * blue: blue value.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6912 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6913 void API dw_color_foreground_set(unsigned long value)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6914 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6915 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	6916
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6917 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	6918 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	6919
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	6920 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	6921
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6922 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	6923 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	6924 _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	6925 _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	6926 _hBrush[threadid] = CreateSolidBrush(_foreground[threadid]);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6927 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6928
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6929 /* Sets the current background drawing color.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6930 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6931 * red: red value.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6932 * green: green value.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6933 * blue: blue value.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6934 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6935 void API dw_color_background_set(unsigned long value)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6936 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6937 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	6938
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6939 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	6940 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	6941
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	6942 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	6943
370 e5156e7e5f19 Fixes for background set to DW_CLR_DEFAULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 369 diff changeset	6944 if(value == DW_RGB_TRANSPARENT)
e5156e7e5f19 Fixes for background set to DW_CLR_DEFAULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 369 diff changeset	6945 _background[threadid] = DW_RGB_TRANSPARENT;
e5156e7e5f19 Fixes for background set to DW_CLR_DEFAULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 369 diff changeset	6946 else
e5156e7e5f19 Fixes for background set to DW_CLR_DEFAULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 369 diff changeset	6947 _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	6948 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6949
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6950 /* Draw a point on a window (preferably a render window).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6951 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6952 * handle: Handle to the window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6953 * pixmap: Handle to the pixmap. (choose only one of these)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6954 * x: X coordinate.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6955 * y: Y coordinate.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6956 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6957 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	6958 {
58 5c66a108aa47 Fixed 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 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	6960 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	6961
5c66a108aa47 Fixed 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 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	6963 threadid = 0;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6964
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6965 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	6966 hdcPaint = GetDC(handle);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6967 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	6968 hdcPaint = pixmap->hdc;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6969 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6970 return;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6971
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6972 SetPixel(hdcPaint, x, y, _foreground[threadid]);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6973 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	6974 ReleaseDC(handle, hdcPaint);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6975 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6976
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6977 /* Draw a line on a window (preferably a render window).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6978 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6979 * handle: Handle to the window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6980 * pixmap: Handle to the pixmap. (choose only one of these)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6981 * x1: First X coordinate.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6982 * y1: First Y coordinate.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6983 * x2: Second X coordinate.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6984 * y2: Second Y coordinate.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6985 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	6986 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	6987 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6988 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	6989 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	6990 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	6991
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	6992 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	6993 threadid = 0;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6994
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6995 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	6996 hdcPaint = GetDC(handle);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6997 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	6998 hdcPaint = pixmap->hdc;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6999 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7000 return;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7001
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7002 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	7003 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	7004 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	7005 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	7006 /* 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	7007 * 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	7008 */
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7009 SetPixel(hdcPaint, x2, y2, _foreground[threadid]);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7010 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	7011 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	7012 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7013
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7014 /* 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	7015 * 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	7016 * 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	7017 * 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	7018 * 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	7019 * 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	7020 * 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	7021 * 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	7022 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7023 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	7024 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7025 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	7026 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	7027 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	7028 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	7029 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	7030
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7031 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	7032 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	7033
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7034 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	7035 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	7036 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	7037 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	7038 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	7039 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	7040
436 98d6c00fe11e Fix bug with specifying fonts with modifiers; the modifiers were not being mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 429 diff changeset	7041 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	7042 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	7043 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	7044 else
98d6c00fe11e Fix bug with specifying fonts with modifiers; the modifiers were not being mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 429 diff changeset	7045 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	7046 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	7047 ReleaseDC(handle, hdcPaint);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7048 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7049
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7050 /* Draw text on a window (preferably a render window).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7051 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7052 * handle: Handle to the window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7053 * pixmap: Handle to the pixmap. (choose only one of these)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7054 * x: X coordinate.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7055 * y: Y coordinate.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7056 * text: Text to be displayed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7057 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7058 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	7059 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7060 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	7061 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	7062 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	7063 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	7064 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	7065
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7066 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	7067 threadid = 0;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7068
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7069 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	7070 hdc = GetDC(handle);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7071 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	7072 hdc = pixmap->hdc;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7073 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7074 return;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7075
455 dd04a4d781f8 Fixes GDI font object leak when calling dw_window_set_font() on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 454 diff changeset	7076 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	7077 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	7078 else
dd04a4d781f8 Fixes GDI font object leak when calling dw_window_set_font() on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 454 diff changeset	7079 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	7080
dd04a4d781f8 Fixes GDI font object leak when calling dw_window_set_font() on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 454 diff changeset	7081 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	7082 {
dd04a4d781f8 Fixes GDI font object leak when calling dw_window_set_font() on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 454 diff changeset	7083 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	7084 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	7085 }
dd04a4d781f8 Fixes GDI font object leak when calling dw_window_set_font() on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 454 diff changeset	7086
dd04a4d781f8 Fixes GDI font object leak when calling dw_window_set_font() on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 454 diff changeset	7087 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	7088 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	7089 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	7090 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	7091 SetBkMode(hdc, TRANSPARENT);
39983df2b93d Updated the license information, and copyrights. Code to do background bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 355 diff changeset	7092 else
39983df2b93d Updated the license information, and copyrights. Code to do background bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 355 diff changeset	7093 {
39983df2b93d Updated the license information, and copyrights. Code to do background bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 355 diff changeset	7094 SetBkMode(hdc, OPAQUE);
39983df2b93d Updated the license information, and copyrights. Code to do background bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 355 diff changeset	7095 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	7096 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7097 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	7098 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	7099 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	7100 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	7101 DeleteObject(hFont);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7102 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	7103 ReleaseDC(handle, hdc);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7104 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7105
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	7106 /* 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	7107 * 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	7108 * 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	7109 * 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	7110 * 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	7111 * 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	7112 * 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	7113 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7114 void API dw_font_text_extents(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	7115 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7116 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	7117 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	7118 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	7119 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	7120
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	7121 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	7122 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	7123 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	7124 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	7125 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	7126 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	7127
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7128 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7129 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	7130
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7131 if(handle)
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	7132 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	7133 else
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	7134 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	7135
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7136 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	7137 {
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	7138 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	7139 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	7140 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7141 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7142 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	7143
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7144 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	7145
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	7146 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	7147 *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	7148
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	7149 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	7150 *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	7151
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7152 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	7153 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	7154 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	7155 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	7156 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	7157 }
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	7158
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7159 /* Call this after drawing to the screen to make sure
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7160 * anything you have drawn is visible.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7161 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7162 void API dw_flush(void)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7163 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7164 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7165
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7166 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7167 * Creates a pixmap with given parameters.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7168 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7169 * handle: Window handle the pixmap is associated with.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7170 * width: Width of the pixmap in pixels.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7171 * height: Height of the pixmap in pixels.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7172 * depth: Color depth of the pixmap.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7173 * Returns:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7174 * A handle to a pixmap or NULL on failure.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7175 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7176 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	7177 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7178 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	7179 BITMAP bm;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7180 HDC hdc;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7181
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7182 if (!(pixmap = calloc(1,sizeof(struct _hpixmap))))
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7183 return NULL;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7184
58 5c66a108aa47 Fixed 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 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	7186
5c66a108aa47 Fixed 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 pixmap->width = width; pixmap->height = height;
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 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	7190 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	7191 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	7192
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7193 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	7194
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7195 ReleaseDC(handle, hdc);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7196
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7197 return pixmap;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7198 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7199
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7200 /*
241 00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7201 * Creates a pixmap from a file.
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7202 * Parameters:
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7203 * 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	7204 * 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	7205 * DW pick the appropriate file extension.
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7206 * (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	7207 * Returns:
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7208 * 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	7209 */
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7210 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	7211 {
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7212 HPIXMAP pixmap;
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7213 BITMAP bm;
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7214 HDC hdc;
242 36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7215 char *file = malloc(strlen(filename) + 5);
241 00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7216
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7217 if (!file \|\| !(pixmap = calloc(1,sizeof(struct _hpixmap))))
242 36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7218 {
36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7219 if(file)
36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7220 free(file);
241 00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7221 return NULL;
242 36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7222 }
241 00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7223
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7224 strcpy(file, filename);
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7225
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7226 /* 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	7227 if(access(file, 04) != 0)
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7228 {
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7229 /* Try with .bmp extention */
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7230 strcat(file, ".bmp");
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7231 if(access(file, 04) != 0)
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7232 {
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7233 free(pixmap);
242 36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7234 free(file);
241 00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7235 return NULL;
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7236 }
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7237 }
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7238
242 36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7239 hdc = GetDC(handle);
241 00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7240
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7241 pixmap->handle = handle;
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7242 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	7243
36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7244 if(!pixmap->hbm)
36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7245 {
36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7246 free(file);
36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7247 free(pixmap);
36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7248 ReleaseDC(handle, hdc);
36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7249 return NULL;
36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7250 }
36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7251
241 00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7252 pixmap->hdc = CreateCompatibleDC(hdc);
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7253
243 3c1e39905f2f Use GetObject() instead of GetBitmapDimensionEx() to get the loaded bitmap bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 242 diff changeset	7254 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	7255
3c1e39905f2f Use GetObject() instead of GetBitmapDimensionEx() to get the loaded bitmap bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 242 diff changeset	7256 pixmap->width = bm.bmWidth; pixmap->height = bm.bmHeight;
242 36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7257
241 00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7258 SelectObject(pixmap->hdc, pixmap->hbm);
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7259
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7260 ReleaseDC(handle, hdc);
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7261
242 36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7262 free(file);
36013ddd3f5b Fixes for Windows code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 241 diff changeset	7263
241 00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7264 return pixmap;
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7265 }
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7266
00d2b1bcf036 Added dw_pixmap_new_from_file(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 238 diff changeset	7267 /*
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7268 * Creates a pixmap from internal resource graphic specified by id.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7269 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7270 * handle: Window handle the pixmap is associated with.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7271 * id: Resource ID associated with requested pixmap.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7272 * Returns:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7273 * A handle to a pixmap or NULL on failure.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7274 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7275 HPIXMAP API dw_pixmap_grab(HWND handle, ULONG id)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7276 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7277 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	7278 BITMAP bm;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7279 HDC hdc;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7280
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7281 if (!(pixmap = calloc(1,sizeof(struct _hpixmap))))
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7282 return NULL;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7283
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7284 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	7285
5c66a108aa47 Fixed 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
5c66a108aa47 Fixed 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 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	7288 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	7289
5c66a108aa47 Fixed 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 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	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 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	7293
5c66a108aa47 Fixed 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 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	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 ReleaseDC(handle, hdc);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7297
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7298 return pixmap;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7299 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7300
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7301 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7302 * Destroys an allocated pixmap.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7303 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7304 * pixmap: Handle to a pixmap returned by
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7305 * dw_pixmap_new..
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7306 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7307 void API dw_pixmap_destroy(HPIXMAP pixmap)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7308 {
58 5c66a108aa47 Fixed 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 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	7310 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7311 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	7312 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	7313 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	7314 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7315 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7316
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7317 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7318 * Copies from one item to another.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7319 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7320 * dest: Destination window handle.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7321 * destp: Destination pixmap. (choose only one).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7322 * xdest: X coordinate of destination.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7323 * ydest: Y coordinate of destination.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7324 * width: Width of area to copy.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7325 * height: Height of area to copy.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7326 * src: Source window handle.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7327 * srcp: Source pixmap. (choose only one).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7328 * xsrc: X coordinate of source.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7329 * ysrc: Y coordinate of source.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7330 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7331 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	7332 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7333 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	7334 HDC hdcsrc;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7335
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7336 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	7337 hdcdest = GetDC(dest);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7338 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	7339 hdcdest = destp->hdc;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7340 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7341 return;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7342
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7343 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	7344 hdcsrc = GetDC(src);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7345 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	7346 hdcsrc = srcp->hdc;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7347 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7348 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	7349
5c66a108aa47 Fixed 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 BitBlt(hdcdest, xdest, ydest, width, height, hdcsrc, xsrc, ysrc, SRCCOPY);
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(!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	7353 ReleaseDC(dest, hdcdest);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7354 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	7355 ReleaseDC(src, hdcsrc);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7356 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7357
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7358 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7359 * Emits a beep.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7360 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7361 * freq: Frequency.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7362 * dur: Duration.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7363 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7364 void API dw_beep(int freq, int dur)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7365 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7366 Beep(freq, dur);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7367 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7368
157 a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7369 /* Open a shared library and return a handle.
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7370 * Parameters:
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7371 * name: Base name of the shared library.
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7372 * handle: Pointer to a module handle,
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7373 * will be filled in with the handle.
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7374 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7375 int API dw_module_load(char name, HMOD handle)
157 a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7376 {
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7377 if(!handle)
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7378 return -1;
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7379
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7380 *handle = LoadLibrary(name);
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7381 return (NULL == *handle);
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7382 }
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7383
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7384 /* Queries the address of a symbol within open handle.
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7385 * Parameters:
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7386 * handle: Module handle returned by dw_module_load()
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7387 * name: Name of the symbol you want the address of.
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7388 * func: A pointer to a function pointer, to obtain
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7389 * the address.
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7390 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7391 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	7392 {
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7393 if(!func \|\| !name)
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7394 return -1;
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7395
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7396 if(0 == strlen(name))
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7397 return -1;
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7398
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7399 func = (void)GetProcAddress(handle, name);
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7400 return (NULL == *func);
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7401 }
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7402
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7403 /* Frees the shared library previously opened.
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7404 * Parameters:
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7405 * handle: Module handle returned by dw_module_load()
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7406 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7407 int API dw_module_close(HMOD handle)
157 a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7408 {
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7409 return FreeLibrary(handle);
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7410 }
a07dd2e819f3 Added module support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 155 diff changeset	7411
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7412 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7413 * Returns the handle to an unnamed mutex semaphore.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7414 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7415 HMTX API dw_mutex_new(void)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7416 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7417 return (HMTX)CreateMutex(NULL, FALSE, NULL);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7418 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7419
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7420 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7421 * Closes a semaphore created by dw_mutex_new().
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7422 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7423 * mutex: The handle to the mutex returned by dw_mutex_new().
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7424 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7425 void API dw_mutex_close(HMTX mutex)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7426 {
58 5c66a108aa47 Fixed 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 CloseHandle((HANDLE)mutex);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7428 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7429
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7430 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7431 * Tries to gain access to the semaphore, if it can't it blocks.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7432 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7433 * mutex: The handle to the mutex returned by dw_mutex_new().
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7434 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7435 void API dw_mutex_lock(HMTX mutex)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7436 {
63 a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	7437 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	7438 {
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	7439 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	7440
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	7441 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	7442 {
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	7443 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	7444 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	7445 }
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	7446 }
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	7447 else
a6801a2260af Synched up with the latest dynamic windows, has new slider support and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 61 diff changeset	7448 WaitForSingleObject((HANDLE)mutex, INFINITE);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7449 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7450
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7451 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7452 * Reliquishes the access to the semaphore.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7453 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7454 * mutex: The handle to the mutex returned by dw_mutex_new().
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7455 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7456 void API dw_mutex_unlock(HMTX mutex)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7457 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7458 ReleaseMutex((HANDLE)mutex);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7459 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7460
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7461 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7462 * Returns the handle to an unnamed event semaphore.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7463 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7464 HEV API dw_event_new(void)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7465 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7466 return CreateEvent(NULL, TRUE, FALSE, NULL);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7467 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7468
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7469 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7470 * Resets a semaphore created by dw_event_new().
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7471 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7472 * eve: The handle to the event returned by dw_event_new().
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7473 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7474 int API dw_event_reset(HEV eve)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7475 {
58 5c66a108aa47 Fixed 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 return ResetEvent(eve);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7477 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7478
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7479 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7480 * Posts a semaphore created by dw_event_new(). Causing all threads
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7481 * waiting on this event in dw_event_wait to continue.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7482 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7483 * eve: The handle to the event returned by dw_event_new().
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7484 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7485 int API dw_event_post(HEV eve)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7486 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7487 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	7488 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7489
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7490 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7491 * Waits on a semaphore created by dw_event_new(), until the
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7492 * event gets posted or until the timeout expires.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7493 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7494 * eve: The handle to the event returned by dw_event_new().
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7495 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7496 int API dw_event_wait(HEV eve, unsigned long timeout)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7497 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7498 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	7499
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7500 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	7501 if(rc == WAIT_OBJECT_0)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7502 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	7503 if(rc == WAIT_ABANDONED)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7504 return -1;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7505 return 0;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7506 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7507
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7508 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7509 * Closes a semaphore created by dw_event_new().
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7510 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7511 * eve: The handle to the event returned by dw_event_new().
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7512 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7513 int API dw_event_close(HEV *eve)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7514 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7515 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	7516 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	7517 return FALSE;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7518 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7519
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7520 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7521 * Creates a new thread with a starting point of func.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7522 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7523 * func: Function which will be run in the new thread.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7524 * data: Parameter(s) passed to the function.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7525 * stack: Stack size of new thread (OS/2 and Windows only).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7526 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7527 DWTID API dw_thread_new(void func, void data, int stack)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7528 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7529 #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	7530 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	7531 #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	7532 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	7533 #endif
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7534 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7535
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7536 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7537 * Ends execution of current thread immediately.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7538 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7539 void API dw_thread_end(void)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7540 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7541 #if !defined(__CYGWIN__)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7542 _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	7543 #endif
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7544 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7545
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7546 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7547 * Returns the current thread's ID.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7548 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7549 DWTID API dw_thread_id(void)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7550 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7551 #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	7552 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	7553 #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	7554 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	7555 #endif
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7556 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7557
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7558 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7559 * Cleanly terminates a DW session, should be signal handler safe.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7560 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7561 * exitcode: Exit code reported to the operating system.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7562 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7563 void API dw_exit(int exitcode)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7564 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7565 exit(exitcode);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7566 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7567
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7568 /*
118 c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7569 * 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	7570 * 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	7571 * 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	7572 * 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	7573 * 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	7574 * Returns:
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7575 * 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	7576 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7577 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	7578 {
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7579 HWND tmp = CreateWindow(SplitbarClassName,
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7580 "",
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7581 WS_VISIBLE \| WS_CHILD \| WS_CLIPCHILDREN,
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7582 0,0,2000,1000,
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7583 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	7584 (HMENU)id,
118 c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7585 DWInstance,
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7586 NULL);
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7587
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7588 if(tmp)
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7589 {
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	7590 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	7591 float percent = (float )malloc(sizeof(float));
118 c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7592
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7593 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	7594 SetParent(tmpbox, tmp);
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7595 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	7596
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	7597 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	7598 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	7599 SetParent(tmpbox, tmp);
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7600 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	7601 *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	7602 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	7603 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	7604 }
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7605 return tmp;
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7606 }
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7607
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7608 /*
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7609 * Sets the position of a splitbar (pecentage).
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7610 * Parameters:
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7611 * 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	7612 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7613 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	7614 {
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	7615 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	7616 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	7617 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	7618
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	7619 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	7620 *mypercent = percent;
129 e47c52b37cdd Code cleanup and OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 127 diff changeset	7621
e47c52b37cdd Code cleanup and OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 127 diff changeset	7622 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	7623
e47c52b37cdd Code cleanup and OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 127 diff changeset	7624 _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	7625 }
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7626
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7627 /*
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7628 * Gets the position of a splitbar (pecentage).
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7629 * Parameters:
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	7630 * 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	7631 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7632 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	7633 {
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	7634 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	7635
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	7636 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	7637 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	7638 return 0.0;
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
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7641 /*
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7642 * Pack windows (widgets) into a box from the end (or bottom).
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7643 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7644 * box: Window handle of the box to be packed into.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7645 * item: Window handle of the item to be back.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7646 * width: Width in pixels of the item or -1 to be self determined.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7647 * height: Height in pixels of the item or -1 to be self determined.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7648 * hsize: TRUE if the window (widget) should expand horizontally to fill space given.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7649 * vsize: TRUE if the window (widget) should expand vertically to fill space given.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7650 * pad: Number of pixels of padding around the item.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7651 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7652 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	7653 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7654 Box *thisbox;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7655
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	7656 /*
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	7657 * 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	7658 * 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	7659 */
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	7660 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	7661 {
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	7662 dw_messagebox("dw_box_pack_end()", DW_MB_OK\|DW_MB_ERROR, "Danger! Danger! Will Robinson; box and item are the same!",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	7663 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	7664 }
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	7665
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	7666 thisbox = (Box *)GetWindowLongPtr(box, GWLP_USERDATA);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7667 if(thisbox)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7668 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7669 int z;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7670 Item tmpitem, thisitem = thisbox->items;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7671 char tmpbuf[100];
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7672
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7673 tmpitem = malloc(sizeof(Item)*(thisbox->count+1));
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7674
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7675 for(z=0;z<thisbox->count;z++)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7676 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7677 tmpitem[z+1] = thisitem[z];
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7678 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7679
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7680 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	7681
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	7682 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	7683 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	7684 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	7685 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	7686
440 9af47c551a56 Noticed an artifact from the OS/2 port that was incorrect. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 439 diff changeset	7687 if(strnicmp(tmpbuf, FRAMECLASSNAME, strlen(FRAMECLASSNAME)+1)==0)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7688 tmpitem[0].type = TYPEBOX;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7689 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	7690 {
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	7691 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	7692 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	7693 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	7694 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	7695
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7696 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	7697 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7698
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7699 tmpitem[0].hwnd = item;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7700 tmpitem[0].origwidth = tmpitem[0].width = width;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7701 tmpitem[0].origheight = tmpitem[0].height = height;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7702 tmpitem[0].pad = pad;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7703 if(hsize)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7704 tmpitem[0].hsize = SIZEEXPAND;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7705 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7706 tmpitem[0].hsize = SIZESTATIC;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7707
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7708 if(vsize)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7709 tmpitem[0].vsize = SIZEEXPAND;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7710 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7711 tmpitem[0].vsize = SIZESTATIC;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7712
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7713 thisbox->items = tmpitem;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7714
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7715 if(thisbox->count)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7716 free(thisitem);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7717
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7718 thisbox->count++;
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 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	7721 if(strncmp(tmpbuf, UPDOWN_CLASS, strlen(UPDOWN_CLASS)+1)==0)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7722 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	7723 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	7724
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7725 if(cinfo)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7726 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7727 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	7728 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	7729 SendMessage(item, UDM_SETBUDDY, (WPARAM)cinfo->buddy, 0);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7730 }
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
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7735 /*
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	7736 * 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	7737 * 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	7738 * 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	7739 * 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	7740 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7741 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	7742 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	7743 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	7744
b03b24bb95f8 Added dw_window_default() to set the default focus widget in a dialog. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 33 diff changeset	7745 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	7746 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	7747 }
b03b24bb95f8 Added dw_window_default() to set the default focus widget in a dialog. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 33 diff changeset	7748
b03b24bb95f8 Added dw_window_default() to set the default focus widget in a dialog. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 33 diff changeset	7749 /*
40 88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	7750 * 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	7751 * Parameters:
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	7752 * 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	7753 * 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	7754 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7755 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	7756 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	7757 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	7758
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7759 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	7760 cinfo->clickdefault = next;
40 88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	7761 }
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	7762
88c9c7410c22 Lots of fixes and new functions on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 39 diff changeset	7763 /*
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7764 * Returns some information about the current operating environment.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7765 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7766 * env: Pointer to a DWEnv struct.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7767 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7768 void API dw_environment_query(DWEnv *env)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7769 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7770 if(!env)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7771 return;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7772
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7773 /* 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	7774
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7775 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	7776 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	7777
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7778 /* 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	7779
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7780 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	7781
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7782 if (dwVersion < 0x80000000)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7783 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7784 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	7785 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	7786 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	7787 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	7788 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	7789 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	7790
5c66a108aa47 Fixed 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 env->MajorBuild = (DWORD)(HIWORD(dwVersion));
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7792 }
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7793 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	7794 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7795 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	7796 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	7797 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7798
15 81833f25b1aa Added new Dynamic Windows build information to the DWEnv struct. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 14 diff changeset	7799 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	7800 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	7801 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	7802 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	7803 env->DWSubVersion = DW_SUB_VERSION;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7804 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7805
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7806 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7807 * Opens a file dialog and queries user selection.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7808 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7809 * title: Title bar text for dialog.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7810 * defpath: The default path of the open dialog.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7811 * 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	7812 * flags: DW_FILE_OPEN or DW_FILE_SAVE or DW_DIRECTORY_OPEN.
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7813 * Returns:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7814 * NULL on error. A malloced buffer containing
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7815 * the file path on success.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7816 *
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7817 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7818 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	7819 {
58 5c66a108aa47 Fixed 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 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	7821 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	7822 int rc;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7823
449 787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	7824 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	7825 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	7826 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	7827 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	7828
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	7829 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	7830 {
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	7831 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	7832 {
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	7833 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	7834 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	7835 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	7836 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	7837 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	7838 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	7839 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	7840
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	7841 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	7842 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	7843 {
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	7844 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	7845 {
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	7846 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	7847 }
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	7848
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	7849 // 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	7850 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	7851 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	7852 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	7853 }
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	7854 }
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	7855 }
58 5c66a108aa47 Fixed 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
449 787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	7857 {
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	7858 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	7859 {
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	7860 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	7861 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	7862 }
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	7863
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	7864 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	7865
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	7866 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	7867 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	7868 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	7869 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	7870 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	7871 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	7872 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	7873 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	7874 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	7875
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	7876 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	7877 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	7878 else
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	7879 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	7880
787cc1e27897 Add support for directory browsing under Win32. DW_DIRECTORY_OPEN can be mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 448 diff changeset	7881 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	7882 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	7883 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7884 return NULL;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7885 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7886
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7887 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7888 * Execute and external program in a seperate session.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7889 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7890 * program: Program name with optional path.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7891 * type: Either DW_EXEC_CON or DW_EXEC_GUI.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7892 * params: An array of pointers to string arguements.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7893 * Returns:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7894 * -1 on error.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7895 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7896 int API dw_exec(char program, int type, char *params)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7897 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7898 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	7899 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	7900
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7901 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	7902 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7903 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	7904 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7905
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7906 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	7907
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7908 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	7909 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7910 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	7911 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	7912 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	7913 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	7914 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7915 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	7916
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7917 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	7918
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7919 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	7920 {
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7921 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	7922 }
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7923 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	7924
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7925 return retcode;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7926 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7927
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7928 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7929 * Loads a web browser pointed at the given URL.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7930 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7931 * url: Uniform resource locator.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7932 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7933 int API dw_browse(char *url)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7934 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7935 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	7936 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	7937
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7938 if(strlen(url) > 7 && strncmp(url, "file://", 7) == 0)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7939 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7940 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	7941
5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7942 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	7943 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	7944
5c66a108aa47 Fixed 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 for(z=0;z<len;z++)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7946 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7947 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	7948 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	7949 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	7950 browseurl[z] = '\\';
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7951 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7952 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7953
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7954 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	7955 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	7956 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	7957 return 1;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7958 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7959
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7960 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7961 * Returns a pointer to a static buffer which containes the
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7962 * current user directory. Or the root directory (C:\ on
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7963 * OS/2 and Windows).
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7964 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7965 char * API dw_user_dir(void)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7966 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7967 static char _user_dir[1024] = "";
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7968
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7969 if(!_user_dir[0])
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7970 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7971 /* Figure out how to do this the "Windows way" */
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7972 char *home = getenv("HOME");
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7973
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7974 if(home)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7975 strcpy(_user_dir, home);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7976 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7977 strcpy(_user_dir, "C:\\");
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7978 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7979 return _user_dir;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7980 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7981
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7982 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7983 * Call a function from the window (widget)'s context.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7984 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7985 * handle: Window handle of the widget.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7986 * function: Function pointer to be called.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7987 * data: Pointer to the data to be passed to the function.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7988 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	7989 void API dw_window_function(HWND handle, void function, void data)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7990 {
58 5c66a108aa47 Fixed example test app at the bottom of the source to use new dw_init bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 57 diff changeset	7991 SendMessage(handle, WM_USER, (WPARAM)function, (LPARAM)data);
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7992 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7993
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	7994 /* 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	7995 * 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	7996 * 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	7997 */
180 4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	7998 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	7999 {
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8000 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	8001
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8002 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	8003 {
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8004 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	8005 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	8006 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	8007 }
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8008 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	8009 }
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8010
180 4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8011 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	8012 {
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8013 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	8014
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8015 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	8016 {
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8017 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	8018 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	8019 }
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8020 else
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8021 {
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8022 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	8023 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	8024 {
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8025 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	8026 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	8027
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8028 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	8029
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8030 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	8031 *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	8032 else
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8033 {
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8034 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	8035 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	8036 {
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8037 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	8038 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	8039 }
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8040 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	8041 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	8042 else
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8043 *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	8044 }
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8045 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	8046 }
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8047 }
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8048 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	8049 }
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8050
180 4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8051 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	8052 {
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8053 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	8054
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8055 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	8056 {
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8057 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	8058 {
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8059 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	8060 {
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	8061 *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	8062 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	8063 free(tmp);
180 4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8064 if(!all)
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8065 return 0;
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8066 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	8067 }
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8068 else
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8069 {
180 4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8070 /* If all is true we should
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8071 * never get here.
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8072 */
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8073 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	8074 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	8075 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	8076 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	8077 }
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8078 }
180 4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8079 else
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8080 {
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8081 prev = tmp;
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8082 tmp = tmp->next;
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8083 }
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8084 }
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8085 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	8086 }
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8087
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8088 /*
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8089 * 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	8090 * Parameters:
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8091 * 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	8092 * 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	8093 * 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	8094 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	8095 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	8096 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	8097 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	8098
118 c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	8099 if(!cinfo)
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	8100 {
180 4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8101 if(!dataname)
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8102 return;
4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8103
118 c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	8104 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	8105 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	8106 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	8107 }
c170181668b7 Initial new splitbar code on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 111 diff changeset	8108
90 eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8109 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	8110 {
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8111 if(data)
180 4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8112 _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	8113 else
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8114 {
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8115 if(dataname)
180 4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8116 _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	8117 else
180 4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8118 _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	8119 }
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8120 }
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8121 }
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8122
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8123 /*
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8124 * 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	8125 * Parameters:
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8126 * 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	8127 * 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	8128 * 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	8129 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	8130 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	8131 {
444 faaeec0dba1d Changed from GetWindowLong() and SetWindowLong() to GetWindowLongPtr() and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 440 diff changeset	8132 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	8133
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8134 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	8135 {
180 4207e64d4689 Fixing leaks on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 177 diff changeset	8136 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	8137 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	8138 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	8139 }
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8140 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	8141 }
eeb98f881663 Committed the dw_window_set/get_data() changes from the FX tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 89 diff changeset	8142
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8143 /*
197 f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8144 * 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	8145 * Parameters:
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8146 * 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	8147 * 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	8148 * 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	8149 * Returns:
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8150 * 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	8151 */
200 446dd8cea477 Removed window parameter on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 197 diff changeset	8152 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	8153 {
446dd8cea477 Removed window parameter on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 197 diff changeset	8154 if(sigfunc)
446dd8cea477 Removed window parameter on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 197 diff changeset	8155 {
461 12ba7e744560 Fixes timer problems on Windows, however this may break Win95 support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 456 diff changeset	8156 int timerid = SetTimer(NULL, 0, interval, _TimerProc);
200 446dd8cea477 Removed window parameter on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 197 diff changeset	8157
446dd8cea477 Removed window parameter on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 197 diff changeset	8158 if(timerid)
446dd8cea477 Removed window parameter on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 197 diff changeset	8159 {
446dd8cea477 Removed window parameter on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 197 diff changeset	8160 _new_signal(WM_TIMER, NULL, timerid, sigfunc, data);
446dd8cea477 Removed window parameter on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 197 diff changeset	8161 return timerid;
446dd8cea477 Removed window parameter on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 197 diff changeset	8162 }
197 f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8163 }
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8164 return 0;
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8165 }
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8166
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8167 /*
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8168 * 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	8169 * Parameters:
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8170 * 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	8171 */
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8172 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	8173 {
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8174 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	8175
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8176 /* 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	8177 if(!id)
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8178 return;
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8179
200 446dd8cea477 Removed window parameter on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 197 diff changeset	8180 KillTimer(NULL, id);
446dd8cea477 Removed window parameter on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 197 diff changeset	8181
197 f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8182 while(tmp)
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8183 {
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8184 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	8185 {
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8186 if(prev)
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8187 {
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8188 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	8189 free(tmp);
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8190 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	8191 }
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8192 else
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8193 {
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8194 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	8195 free(tmp);
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8196 tmp = Root;
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8197 }
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8198 }
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8199 else
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8200 {
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8201 prev = tmp;
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8202 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	8203 }
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8204 }
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8205 }
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8206
f3718165f0b2 Implemented scrollbars and timers on Windows, and added scrollbar to the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 194 diff changeset	8207 /*
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8208 * Add a callback to a window event.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8209 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8210 * window: Window handle of signal to be called back.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8211 * signame: A string pointer identifying which signal to be hooked.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8212 * sigfunc: The pointer to the function to be used as the callback.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8213 * data: User data to be passed to the handler function.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8214 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	8215 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	8216 {
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	8217 ULONG message = 0, id = 0;
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8218
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8219 if(window && signame && sigfunc)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8220 {
307 324587c06cea Use the signal #defines internally so all that is required to change bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 303 diff changeset	8221 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	8222 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	8223
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8224 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	8225 {
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	8226 /* 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	8227 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	8228 {
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	8229 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	8230 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	8231
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	8232 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	8233 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	8234
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	8235 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	8236 {
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	8237 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	8238 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	8239 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	8240 }
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	8241 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	8242 {
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	8243 /* 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	8244 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	8245 }
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	8246 }
c3dfa117b080 Added new code to make the menu handlers window local instead of global. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 461 diff changeset	8247 _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	8248 }
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8249 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8250 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8251
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8252 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8253 * Removes callbacks for a given window with given name.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8254 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8255 * window: Window handle of callback to be removed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8256 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	8257 void API dw_signal_disconnect_by_name(HWND window, char *signame)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8258 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8259 SignalHandler prev = NULL, tmp = Root;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8260 ULONG message;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8261
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8262 if(!window \|\| !signame \|\| (message = _findsigmessage(signame)) == 0)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8263 return;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8264
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8265 while(tmp)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8266 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8267 if(tmp->window == window && tmp->message == message)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8268 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8269 if(prev)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8270 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8271 prev->next = tmp->next;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8272 free(tmp);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8273 tmp = prev->next;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8274 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8275 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8276 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8277 Root = tmp->next;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8278 free(tmp);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8279 tmp = Root;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8280 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8281 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8282 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8283 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8284 prev = tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8285 tmp = tmp->next;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8286 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8287 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8288 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8289
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8290 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8291 * Removes all callbacks for a given window.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8292 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8293 * window: Window handle of callback to be removed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8294 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	8295 void API dw_signal_disconnect_by_window(HWND window)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8296 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8297 SignalHandler prev = NULL, tmp = Root;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8298
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8299 while(tmp)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8300 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8301 if(tmp->window == window)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8302 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8303 if(prev)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8304 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8305 prev->next = tmp->next;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8306 free(tmp);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8307 tmp = prev->next;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8308 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8309 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8310 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8311 Root = tmp->next;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8312 free(tmp);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8313 tmp = Root;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8314 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8315 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8316 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8317 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8318 prev = tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8319 tmp = tmp->next;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8320 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8321 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8322 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8323
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8324 /*
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8325 * Removes all callbacks for a given window with specified data.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8326 * Parameters:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8327 * window: Window handle of callback to be removed.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8328 * data: Pointer to the data to be compared against.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8329 */
177 e3dd5c765775 Fixes for Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 173 diff changeset	8330 void API dw_signal_disconnect_by_data(HWND window, void *data)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8331 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8332 SignalHandler prev = NULL, tmp = Root;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8333
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8334 while(tmp)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8335 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8336 if(tmp->window == window && tmp->data == data)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8337 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8338 if(prev)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8339 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8340 prev->next = tmp->next;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8341 free(tmp);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8342 tmp = prev->next;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8343 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8344 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8345 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8346 Root = tmp->next;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8347 free(tmp);
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8348 tmp = Root;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8349 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8350 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8351 else
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8352 {
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8353 prev = tmp;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8354 tmp = tmp->next;
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8355 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8356 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8357 }
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8358

Mercurial > dwindows

annotate win/dw.c @ 468:0a2f13ba2d5c